From 544f0bf641da0728b0922335f1beb7096db2fc6a Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 18 Oct 2019 14:10:14 -0400
Subject: [PATCH] Just rely on <nixpkgs> being good.
The layer above will have to make sure that it is.
---
docs.nix | 2 +-
morph/make-grid.nix | 2 +-
nixos/modules/tests/private-storage.nix | 2 +-
nixos/pkgs/zkapissuer-repo.nix | 2 +-
nixos/unit-tests.nix | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs.nix b/docs.nix
index 2db695d9..813a6cb4 100644
--- a/docs.nix
+++ b/docs.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import ./nixpkgs.nix { } }:
+{ pkgs ? import <nixpkgs> { } }:
let
# NixOS 19.03 packaged graphviz has trouble rendering our architecture
# overview. Latest from upstream does alright, though. Use that.
diff --git a/morph/make-grid.nix b/morph/make-grid.nix
index d740adbe..32e0b98e 100644
--- a/morph/make-grid.nix
+++ b/morph/make-grid.nix
@@ -5,7 +5,7 @@
# server in the morph network.
{ name, nodes }:
let
- pkgs = import ../nixpkgs.nix { };
+ pkgs = import <nixpkgs> { };
# Load our JSON configuration for later use.
cfg = pkgs.lib.trivial.importJSON ./grid.config.json;
in
diff --git a/nixos/modules/tests/private-storage.nix b/nixos/modules/tests/private-storage.nix
index 5df571f2..e4d54198 100644
--- a/nixos/modules/tests/private-storage.nix
+++ b/nixos/modules/tests/private-storage.nix
@@ -1,5 +1,5 @@
let
- pkgs = (import ../../../nixpkgs.nix { });
+ pkgs = import <nixpkgs> { };
pspkgs = import ../pspkgs.nix { inherit pkgs; };
# Separate helper programs so we can write as little perl inside a string
diff --git a/nixos/pkgs/zkapissuer-repo.nix b/nixos/pkgs/zkapissuer-repo.nix
index 481d3096..b406280f 100644
--- a/nixos/pkgs/zkapissuer-repo.nix
+++ b/nixos/pkgs/zkapissuer-repo.nix
@@ -1,5 +1,5 @@
let
- pkgs = import ../../nixpkgs.nix {};
+ pkgs = import <nixpkgs> { };
in
pkgs.fetchFromGitHub {
owner = "PrivateStorageio";
diff --git a/nixos/unit-tests.nix b/nixos/unit-tests.nix
index f5419aa7..75016a17 100644
--- a/nixos/unit-tests.nix
+++ b/nixos/unit-tests.nix
@@ -1,6 +1,6 @@
# The overall unit test suite for PrivateStorageio NixOS configuration.
let
- pkgs = import ../nixpkgs.nix { };
+ pkgs = import <nixpkgs> { };
# Total the numbers in a list.
sum = builtins.foldl' (a: b: a + b) 0;
--
GitLab