Skip to content

NixOS: use pinned dependencies #28

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
roberth wants to merge 2 commits into
base: master
Choose a base branch
from
Open

NixOS: use pinned dependencies #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28c1d90
flake.nix: Factor out packageFunction
roberth Jul 1, 2024
79e9ff7
nixosModules.dwarffs: Use pinned nix instead of overlay
roberth Jul 1, 2024
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
40 changes: 26 additions & 14 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,9 @@
supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
version = "0.1.${nixpkgs.lib.substring 0 8 self.lastModifiedDate}.${self.shortRev or "dirty"}";
in

{

overlay = final: prev: {

dwarffs = with final; let nix = final.nix; in stdenv.mkDerivation {
packageFunction = { stdenv, fuse, nix, nlohmann_json, boost }:
stdenv.mkDerivation {
pname = "dwarffs";
inherit version;

Expand All @@ -38,6 +34,12 @@
'';
};

in

{

overlay = final: prev: {
dwarffs = final.callPackage packageFunction {};
};

defaultPackage = forAllSystems (system: (import nixpkgs {
Expand Down Expand Up @@ -74,14 +76,24 @@
};
});

nixosModules.dwarffs =
{ pkgs, ... }:
{
nixpkgs.overlays = [ self.overlay ];

systemd.packages = [ pkgs.dwarffs ];
nixosModules.dwarffs = { config, lib, pkgs, ... }:
let cfg = config.services.dwarffs;
in
{
options.services.dwarffs = {
package = lib.mkOption {
type = lib.types.package;
description = ''
Which dwarffs package to use.
'';
defaultText = lib.literalMD ''a build using the pinned nix and nixpkgs of the `dwarffs` flake'';
default = self.defaultPackage.${pkgs.stdenv.hostPlatform.system};
};
};
config = {
systemd.packages = [ cfg.package ];

system.fsPackages = [ pkgs.dwarffs ];
system.fsPackages = [ cfg.package ];

systemd.units."run-dwarffs.automount".wantedBy = [ "multi-user.target" ];

Expand All @@ -97,6 +109,6 @@

users.groups.dwarffs = {};
};

};
};
}