From 6690d8eaba9751dcf749753c05d52458e4da692d Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Wed, 14 Jul 2021 17:00:54 +0000
Subject: [PATCH] Make stable2105 the default nixpkgs

---
 morph/grid/local/grid.nix         | 1 -
 morph/grid/production/grid.nix    | 1 -
 morph/grid/testing/grid.nix       | 1 -
 nixos/modules/issuer.nix          | 2 +-
 nixos/modules/private-storage.nix | 2 +-
 nixpkgs.json => nixpkgs-ps.json   | 2 +-
 pspkgs.nix                        | 1 +
 shell.nix                         | 4 ++--
 8 files changed, 6 insertions(+), 8 deletions(-)
 rename nixpkgs.json => nixpkgs-ps.json (88%)
 create mode 100644 pspkgs.nix

diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index 5d05da12..bca902f2 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -71,7 +71,6 @@ let
 in {
   network = {
     description = "PrivateStorage.io LocalDev Grid";
-    pkgs = import ../../../stable2105.nix { };
   };
   inherit payments monitoring storage1 storage2;
 }
diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix
index fe66dc39..1aa60561 100644
--- a/morph/grid/production/grid.nix
+++ b/morph/grid/production/grid.nix
@@ -108,7 +108,6 @@ let
 in {
   network = {
     description = "PrivateStorage.io Production Grid";
-    pkgs = import ../../../stable2105.nix { };
   };
   inherit payments;
   inherit monitoring;
diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix
index 07adee2c..996b1fba 100644
--- a/morph/grid/testing/grid.nix
+++ b/morph/grid/testing/grid.nix
@@ -60,7 +60,6 @@ let
 in {
   network = {
     description = "PrivateStorage.io Testing Grid";
-    pkgs = import ../../../stable2105.nix { };
   };
   inherit payments monitoring storage001;
 }
diff --git a/nixos/modules/issuer.nix b/nixos/modules/issuer.nix
index f28f8f6c..bdf8addc 100644
--- a/nixos/modules/issuer.nix
+++ b/nixos/modules/issuer.nix
@@ -3,7 +3,7 @@
 { lib, pkgs, config, ... }: let
   cfg = config.services.private-storage-issuer;
   # Our own nixpkgs fork:
-  ourpkgs = import (builtins.fetchTarball (builtins.fromJSON (builtins.readFile ../../nixpkgs.json))) { };
+  ourpkgs = import ../../pspkgs.nix {};
 in {
   imports = [
     # Give it a good SSH configuration.
diff --git a/nixos/modules/private-storage.nix b/nixos/modules/private-storage.nix
index 4f6561a0..17ef5a09 100644
--- a/nixos/modules/private-storage.nix
+++ b/nixos/modules/private-storage.nix
@@ -9,7 +9,7 @@ let
   tahoe-base = "/var/db/tahoe-lafs";
 
   # Our own nixpkgs fork:
-  ourpkgs = import (builtins.fetchTarball (builtins.fromJSON (builtins.readFile ../../nixpkgs.json))) { };
+  ourpkgs = import ../../pspkgs.nix {};
 
   # The full path to the directory where the storage server will write
   # incident reports.
diff --git a/nixpkgs.json b/nixpkgs-ps.json
similarity index 88%
rename from nixpkgs.json
rename to nixpkgs-ps.json
index e8a900d4..c5b01313 100644
--- a/nixpkgs.json
+++ b/nixpkgs-ps.json
@@ -1,4 +1,4 @@
-{ "name": "nixpkgs"
+{ "name": "nixpkgs-ps"
 , "url": "https://github.com/PrivateStorageio/nixpkgs/archive/788cc5806d46b89013ddd59db589b748bc20435e.tar.gz"
 , "sha256": "1mjznn4i4524gl5aiapjpy2jzpac1fzp7jvnkamrh9090ndalhar"
 }
diff --git a/pspkgs.nix b/pspkgs.nix
new file mode 100644
index 00000000..d98a5384
--- /dev/null
+++ b/pspkgs.nix
@@ -0,0 +1 @@
+import (builtins.fetchTarball (builtins.fromJSON (builtins.readFile ./nixpkgs-ps.json)))
diff --git a/shell.nix b/shell.nix
index df272a12..7bd00916 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,8 +1,8 @@
 let
-  nixpkgs = import (builtins.fetchTarball (builtins.fromJSON (builtins.readFile ./nixpkgs.json))) { };
+  # ourpkgs = import ./pspkgs.nix { };
   stable2105 = import ./stable2105.nix { };
 in
-{ pkgs ? nixpkgs }:
+{ pkgs ? stable2105 }:
 pkgs.mkShell {
   NIX_PATH = "nixpkgs=${pkgs.path}";
   buildInputs = [
-- 
GitLab