From c0e6cc6101f94ce6015694d90e03463fa4a08f16 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 25 Jun 2020 14:20:52 -0400
Subject: [PATCH] Try installing it
---
nixos/modules/leasereport-repo.nix | 9 +++++++++
nixos/modules/leasereport.nix | 5 +++++
nixos/modules/overlays.nix | 2 ++
nixos/modules/private-storage.nix | 5 +++++
4 files changed, 21 insertions(+)
create mode 100644 nixos/modules/leasereport-repo.nix
create mode 100644 nixos/modules/leasereport.nix
diff --git a/nixos/modules/leasereport-repo.nix b/nixos/modules/leasereport-repo.nix
new file mode 100644
index 00000000..521cada5
--- /dev/null
+++ b/nixos/modules/leasereport-repo.nix
@@ -0,0 +1,9 @@
+let
+ pkgs = import <nixpkgs> {};
+in
+ pkgs.fetchFromGitHub {
+ owner = "PrivateStorageio";
+ repo = "LeaseReport";
+ rev = "59d98d2e0d14ac05e4c57b285463910e04b8a9b0";
+ sha256 = "0w5msd6q7lpfabzs3d5czcb3jbi9vdh5xzp13phjc4gimfdzfd94";
+ }
\ No newline at end of file
diff --git a/nixos/modules/leasereport.nix b/nixos/modules/leasereport.nix
new file mode 100644
index 00000000..fe332623
--- /dev/null
+++ b/nixos/modules/leasereport.nix
@@ -0,0 +1,5 @@
+{ callPackage }:
+let
+ leasereport = import ./leasereport-repo.nix;
+in
+ callPackage "${leasereport}/nix" { }
diff --git a/nixos/modules/overlays.nix b/nixos/modules/overlays.nix
index a644e630..6084665f 100644
--- a/nixos/modules/overlays.nix
+++ b/nixos/modules/overlays.nix
@@ -15,6 +15,8 @@ let
};
in
self: super: {
+ leasereport = self.callPackage ./leasereport.nix { };
+
# Use self.python27 to get the fixed point of all packages (that is, to
# respect all of the overrides). This is important since we want the
# overridden Twisted as a dependency of this env, not the original one.
diff --git a/nixos/modules/private-storage.nix b/nixos/modules/private-storage.nix
index 3b979bfb..c454dd2c 100644
--- a/nixos/modules/private-storage.nix
+++ b/nixos/modules/private-storage.nix
@@ -139,5 +139,10 @@ in
[ "d ${incidents-dir} 0755 root root ${max-incident-age} -"
];
+ environment.systemPackages = [
+ # Provide a useful tool for reporting about shares.
+ pspkgs.leasereport
+ ];
+
};
}
--
GitLab