From 2ba942647e0266dad7c511c15a7a7fb0cca922f6 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Wed, 14 Jul 2021 17:13:33 +0000
Subject: [PATCH] Make naming and handling of different nixpkgs more consistent
---
docs.nix | 2 +-
nixos/modules/issuer.nix | 2 +-
nixos/modules/private-storage.nix | 2 +-
nixpkgs-2105.json | 2 +-
stable2105.nix => nixpkgs-2105.nix | 0
pspkgs.nix => nixpkgs-ps.nix | 0
shell.nix | 8 ++++----
7 files changed, 8 insertions(+), 8 deletions(-)
rename stable2105.nix => nixpkgs-2105.nix (100%)
rename pspkgs.nix => nixpkgs-ps.nix (100%)
diff --git a/docs.nix b/docs.nix
index 9bb64627..4c8b230a 100644
--- a/docs.nix
+++ b/docs.nix
@@ -1,2 +1,2 @@
-{ pkgs ? import ./stable2105.nix { } }:
+{ pkgs ? import ./nixpkgs-2105.nix { } }:
pkgs.callPackage ./privatestorageio.nix { }
diff --git a/nixos/modules/issuer.nix b/nixos/modules/issuer.nix
index bdf8addc..da56a430 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 ../../pspkgs.nix {};
+ ourpkgs = import ../../nixpkgs-ps.nix {};
in {
imports = [
# Give it a good SSH configuration.
diff --git a/nixos/modules/private-storage.nix b/nixos/modules/private-storage.nix
index 17ef5a09..fa5fea83 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 ../../pspkgs.nix {};
+ ourpkgs = import ../../nixpkgs-ps.nix {};
# The full path to the directory where the storage server will write
# incident reports.
diff --git a/nixpkgs-2105.json b/nixpkgs-2105.json
index d441d009..76950db1 100644
--- a/nixpkgs-2105.json
+++ b/nixpkgs-2105.json
@@ -1,4 +1,4 @@
-{ "name": "stable2105"
+{ "name": "release2105"
, "url": "https://releases.nixos.org/nixos/21.05/nixos-21.05.804.5de44c15758/nixexprs.tar.xz"
, "sha256": "002zvc16hyrbs0icx1qj255c9dqjpdxx4bhhfjndlj3kwn40by0m"
}
diff --git a/stable2105.nix b/nixpkgs-2105.nix
similarity index 100%
rename from stable2105.nix
rename to nixpkgs-2105.nix
diff --git a/pspkgs.nix b/nixpkgs-ps.nix
similarity index 100%
rename from pspkgs.nix
rename to nixpkgs-ps.nix
diff --git a/shell.nix b/shell.nix
index 7bd00916..a503d818 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,13 +1,13 @@
let
- # ourpkgs = import ./pspkgs.nix { };
- stable2105 = import ./stable2105.nix { };
+ # ourpkgs = import ./nixpkgs-ps.nix { };
+ release2105 = import ./nixpkgs-2105.nix { };
in
-{ pkgs ? stable2105 }:
+{ pkgs ? release2105 }:
pkgs.mkShell {
NIX_PATH = "nixpkgs=${pkgs.path}";
buildInputs = [
pkgs.morph
- stable2105.vagrant
+ release2105.vagrant
pkgs.jp
];
}
--
GitLab