lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

3p: add poetry2nix

Browse source
This commit is contained in:
Luke Granger-Brown 2023-11-19 20:12:35 +00:00
parent 237f843e44
commit 47f3220444
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ops/nixos/lib/zfs.nix
View file

@ -2,7 +2,7 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
{ lib, config, ... }: { lib, pkgs, config, ... }:
let let
inherit (lib) mkOption types mkAfter mkIf mkDefault; inherit (lib) mkOption types mkAfter mkIf mkDefault;
robCfg = config.services.zfs.rollbackOnBoot; robCfg = config.services.zfs.rollbackOnBoot;
@ -33,10 +33,14 @@ in
}; };
systemd.tmpfiles.rules = mkAfter (builtins.map (x: "L ${x} - - - - /persist{x}") robCfg.keepPaths); systemd.tmpfiles.rules = mkAfter (builtins.map (x: "L ${x} - - - - /persist{x}") robCfg.keepPaths);
boot.initrd.postDeviceCommands = mkIf robCfg.enable boot.initrd.systemd.services.zfs-rollback = {
(mkAfter '' wantedBy = [ "initrd.target" ];
path = [ pkgs.zfs ];
script = ''
zfs rollback -r ${robCfg.snapshot} zfs rollback -r ${robCfg.snapshot}
''); '';
after = [ "zfs-import.target" ];
};
my.vault.bindMountStateTo = mkIf robCfg.enable (mkDefault "/persist/var/lib/vault-agent"); my.vault.bindMountStateTo = mkIf robCfg.enable (mkDefault "/persist/var/lib/vault-agent");
}; };

8
third_party/default.nix vendored
View file

@ -50,6 +50,12 @@ let
rev = "e0fe990b478a66178a58c69cf53daec0478ca6f9"; rev = "e0fe990b478a66178a58c69cf53daec0478ca6f9";
sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c"; sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c";
}; };
poetry2nixSrc = nixpkgs.fetchFromGitHub {
owner = "nix-community";
repo = "poetry2nix";
rev = "ec4364021900f8e0d425d901b6e6ff03cf201efb";
sha256 = "02q3jwj3m78bxh9fdg33khx8w3bcxgsci5qa8ps76vkyhihy20py";
};
tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; inherit nixpkgsConfig; nixpkgsSystem = system; }; tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; inherit nixpkgsConfig; nixpkgsSystem = system; };
in in
@ -90,4 +96,6 @@ rec {
naersk = nixpkgs.callPackage naerskSrc {}; naersk = nixpkgs.callPackage naerskSrc {};
crate2nix = import "${crate2nixSrc}" { pkgs = ch.depot.pkgs; }; crate2nix = import "${crate2nixSrc}" { pkgs = ch.depot.pkgs; };
poetry2nix = import "${poetry2nixSrc}" { pkgs = ch.depot.pkgs; };
} }