about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-06-14T13·02+0000
committerclbot <clbot@tvl.fyi>2022-06-14T13·09+0000
commit3bc9128dfc0c7b7e5d14239b875eef41eb634670 (patch)
treee2491e4dbcad20fb2e0a83f4e10bd3ae1b531806
parentdc56b365e63d8e162b504738f54e4bd91d1b067e (diff)
refactor(3p): fetch impermanence via niv r/4238
Change-Id: Ic6bc463304643a7f983a5f7c182f95a7706ca35b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5868
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: sterni <sternenseemann@systemli.org>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
-rw-r--r--third_party/impermanence/default.nix12
-rw-r--r--third_party/sources/sources.json12
-rw-r--r--users/tazjin/home/shared.nix2
-rw-r--r--users/tazjin/nixos/modules/persistence.nix2
-rw-r--r--users/tazjin/nixos/zamalek/default.nix1
5 files changed, 14 insertions, 15 deletions
diff --git a/third_party/impermanence/default.nix b/third_party/impermanence/default.nix
deleted file mode 100644
index 6ef72e494..000000000
--- a/third_party/impermanence/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# NixOS modules for systems with ephemeral root disks.
-#
-# https://github.com/nix-community/impermanence
-
-{ pkgs, ... }:
-
-pkgs.fetchFromGitHub {
-  owner = "nix-community";
-  repo = "impermanence";
-  rev = "58558845bc68dcf2bb32caa80564f7fe3f6cbc61";
-  sha256 = "10z3g4knkvq838zbfq71pkfyl8cffrpavna448wf5mjscycp0gnv";
-}
diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json
index 901b2ccfe..a8310c63a 100644
--- a/third_party/sources/sources.json
+++ b/third_party/sources/sources.json
@@ -23,6 +23,18 @@
         "url": "https://github.com/nix-community/emacs-overlay/archive/29dcfbc1b29ae7281e95367e0f2358b44224a46e.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
+    "impermanence": {
+        "branch": "master",
+        "description": "Modules to help you handle persistent state on systems with ephemeral root storage [maintainer=@talyz]",
+        "homepage": "",
+        "owner": "nix-community",
+        "repo": "impermanence",
+        "rev": "2f39baeb7d039fda5fc8225111bb79474138e6f4",
+        "sha256": "0x7mwbqj1h3rym93hy1knxd33dzspmy5i7y1k930vg85yp3a1y8q",
+        "type": "tarball",
+        "url": "https://github.com/nix-community/impermanence/archive/2f39baeb7d039fda5fc8225111bb79474138e6f4.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "naersk": {
         "branch": "master",
         "description": "Build rust crates in Nix. No configuration, no code generation, no IFD. Sandbox friendly. [maintainer: @Patryk27]",
diff --git a/users/tazjin/home/shared.nix b/users/tazjin/home/shared.nix
index 03c7ee10b..2fd17cdc0 100644
--- a/users/tazjin/home/shared.nix
+++ b/users/tazjin/home/shared.nix
@@ -4,7 +4,7 @@
 { config, lib, ... }: # home-manager
 
 {
-  imports = [ "${depot.third_party.impermanence}/home-manager.nix" ];
+  imports = [ (depot.third_party.sources.impermanence + "/home-manager.nix") ];
 
   home.persistence."/persist/tazjin/home" = {
     allowOther = true;
diff --git a/users/tazjin/nixos/modules/persistence.nix b/users/tazjin/nixos/modules/persistence.nix
index c81958161..5ed368374 100644
--- a/users/tazjin/nixos/modules/persistence.nix
+++ b/users/tazjin/nixos/modules/persistence.nix
@@ -3,7 +3,7 @@
 
 {
   imports = [
-    "${depot.third_party.impermanence}/nixos.nix"
+    (depot.third_party.sources.impermanence + "/nixos.nix")
   ];
 
   environment.persistence."/persist" = {
diff --git a/users/tazjin/nixos/zamalek/default.nix b/users/tazjin/nixos/zamalek/default.nix
index e29623e81..f832b0cde 100644
--- a/users/tazjin/nixos/zamalek/default.nix
+++ b/users/tazjin/nixos/zamalek/default.nix
@@ -22,7 +22,6 @@ in
     (usermod "physical.nix")
     (usermod "zerotier.nix")
 
-    (depot.third_party.impermanence + "/nixos.nix")
     (pkgs.home-manager.src + "/nixos")
   ] ++ lib.optional (builtins.pathExists ./local-config.nix) ./local-config.nix;