summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2024-08-08 15:04:28 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2024-08-08 15:04:28 +0200
commit5bf6cf54bee7413af45ab105164226141833efe4 (patch)
tree030abdfa1dded4190af627197ab13cdf55df6905
parentbe06f04babc12fb60366c24a22561c1d46895c80 (diff)
downloadnixos-5bf6cf54bee7413af45ab105164226141833efe4.tar
nixos-5bf6cf54bee7413af45ab105164226141833efe4.tar.gz
nixos-5bf6cf54bee7413af45ab105164226141833efe4.tar.bz2
nixos-5bf6cf54bee7413af45ab105164226141833efe4.tar.xz
nixos-5bf6cf54bee7413af45ab105164226141833efe4.zip
...
-rw-r--r--flake.lock11
-rw-r--r--flake.nix3
-rw-r--r--hosts/surtr/email/default.nix2
3 files changed, 7 insertions, 9 deletions
diff --git a/flake.lock b/flake.lock
index 09989a6a..7f45dd74 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,16 +12,16 @@
12 "pre-commit-hooks-nix": "pre-commit-hooks-nix" 12 "pre-commit-hooks-nix": "pre-commit-hooks-nix"
13 }, 13 },
14 "locked": { 14 "locked": {
15 "lastModified": 1723023987, 15 "lastModified": 1723122201,
16 "narHash": "sha256-3ffk/waTFYp0yrZ6PdFKSRJF+0z6O51c6XWirjhDXqM=", 16 "narHash": "sha256-53kVRik4vB++Y+uxN8q7cEMKEMUzex4Y5CWKLs63meA=",
17 "owner": "gkleen", 17 "owner": "gkleen",
18 "repo": "backup-utils", 18 "repo": "backup-utils",
19 "rev": "3b70e591eade840a32aea80264050ddc6a92c599", 19 "rev": "dbfaa111b8408c317b7d5d91d1e0fa145810f232",
20 "type": "gitlab" 20 "type": "gitlab"
21 }, 21 },
22 "original": { 22 "original": {
23 "owner": "gkleen", 23 "owner": "gkleen",
24 "ref": "v0.1.3", 24 "ref": "v0.1.4",
25 "repo": "backup-utils", 25 "repo": "backup-utils",
26 "type": "gitlab" 26 "type": "gitlab"
27 } 27 }
@@ -815,9 +815,6 @@
815 "nixos-hardware": "nixos-hardware", 815 "nixos-hardware": "nixos-hardware",
816 "nixpkgs": "nixpkgs_2", 816 "nixpkgs": "nixpkgs_2",
817 "nixpkgs-eostre": "nixpkgs-eostre", 817 "nixpkgs-eostre": "nixpkgs-eostre",
818 "nixpkgs-installer": [
819 "nixpkgs-stable"
820 ],
821 "nixpkgs-pgbackrest": "nixpkgs-pgbackrest", 818 "nixpkgs-pgbackrest": "nixpkgs-pgbackrest",
822 "nixpkgs-stable": "nixpkgs-stable_2", 819 "nixpkgs-stable": "nixpkgs-stable_2",
823 "nvfetcher": "nvfetcher", 820 "nvfetcher": "nvfetcher",
diff --git a/flake.nix b/flake.nix
index dca04010..119ea781 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,6 @@
35 repo = "nixpkgs"; 35 repo = "nixpkgs";
36 ref = "23.11"; 36 ref = "23.11";
37 }; 37 };
38 nixpkgs-installer.follows = "nixpkgs-stable";
39 home-manager = { 38 home-manager = {
40 type = "github"; 39 type = "github";
41 # owner = "nix-community"; 40 # owner = "nix-community";
@@ -142,7 +141,7 @@
142 type = "gitlab"; 141 type = "gitlab";
143 owner = "gkleen"; 142 owner = "gkleen";
144 repo = "backup-utils"; 143 repo = "backup-utils";
145 ref = "v0.1.3"; 144 ref = "v0.1.4";
146 inputs = { 145 inputs = {
147 nixpkgs.follows = "nixpkgs"; 146 nixpkgs.follows = "nixpkgs";
148 poetry2nix.follows = "poetry2nix"; 147 poetry2nix.follows = "poetry2nix";
diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index c10f611f..4196a8bc 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -23,6 +23,8 @@ let
23 ccert-policy-server = 23 ccert-policy-server =
24 with pkgs.poetry2nix; 24 with pkgs.poetry2nix;
25 mkPoetryApplication { 25 mkPoetryApplication {
26 python = pkgs.python311;
27
26 projectDir = cleanPythonSources { src = ./ccert-policy-server; }; 28 projectDir = cleanPythonSources { src = ./ccert-policy-server; };
27 29
28 overrides = overrides.withDefaults (self: super: { 30 overrides = overrides.withDefaults (self: super: {