diff --git a/docs.nix b/docs.nix index 2db695d9f5756e35824b1dd1fb15938d532bcb96..813a6cb432942fccd96b96ee07313ff84cf885c6 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 d740adbe237cbae54192843a6b11969a4672c6d8..32e0b98ed3ffd5741522f9b0e3ef67037fa6a180 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 5df571f2ad10ba27a0607df11a8405ca767c9f35..e4d541989804992036b324eecd817c91920f62e9 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 481d30960ace0c12443b0b618d2a6d66cc541823..b406280fd06066b5bbcb76d80b30deed28f2eadb 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 f5419aa7fe491c4b0dcf511e028b95e7d64a4cd7..75016a17d128fabe11f4ecaad65dba3471ed863d 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;