diff options
| author | Vincent Ambo <tazjin@google.com> | 2019-12-09T02·54+0000 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2019-12-09T02·55+0000 |
| commit | 46e5a23937c68d89d1d080ad6feef7587bcdbdc8 (patch) | |
| tree | 03352d657ebf25fac56e1b3320a81e82a0de08ed | |
| parent | 39ba7616634522a0495f42034240ff9d114b45a0 (diff) | |
fix: Amend import paths to use whitelisted nixpkgs r/103
| -rw-r--r-- | services/tazblog/default.nix | 2 | ||||
| -rw-r--r-- | third_party/naersk.nix | 2 | ||||
| -rw-r--r-- | tools/blog_cli/default.nix | 2 | ||||
| -rw-r--r-- | tools/kms_pass.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/services/tazblog/default.nix b/services/tazblog/default.nix index 41838e76055f..eecadff6ba17 100644 --- a/services/tazblog/default.nix +++ b/services/tazblog/default.nix @@ -5,7 +5,7 @@ { pkgs, ... }: let - inherit (pkgs.third_party.nixpkgs) writeShellScriptBin haskell; + inherit (pkgs.third_party) writeShellScriptBin haskell; tazblog = haskell.packages.ghc865.callPackage ./tazblog.nix {}; wrapper = writeShellScriptBin "tazblog" '' export PORT=8000 diff --git a/third_party/naersk.nix b/third_party/naersk.nix index 0e708a5781e0..918f0c5c0f55 100644 --- a/third_party/naersk.nix +++ b/third_party/naersk.nix @@ -1,6 +1,6 @@ { pkgs, ... }: -let inherit (pkgs.third_party.nixpkgs) callPackage fetchFromGitHub; +let inherit (pkgs.third_party) callPackage fetchFromGitHub; in callPackage (fetchFromGitHub { owner = "nmattia"; repo = "naersk"; diff --git a/tools/blog_cli/default.nix b/tools/blog_cli/default.nix index 76732667f791..ed283f744f52 100644 --- a/tools/blog_cli/default.nix +++ b/tools/blog_cli/default.nix @@ -1,6 +1,6 @@ { pkgs, ... }: -pkgs.third_party.nixpkgs.buildGoPackage { +pkgs.third_party.buildGoPackage { name = "blog_cli"; goPackagePath = "github.com/tazjin/personal/blog_cli"; src = ./.; diff --git a/tools/kms_pass.nix b/tools/kms_pass.nix index 82a6a9f1f12e..14989b392dd1 100644 --- a/tools/kms_pass.nix +++ b/tools/kms_pass.nix @@ -8,7 +8,7 @@ { pkgs, kms, ... }: -let inherit (pkgs.third_party.nixpkgs) google-cloud-sdk tree writeShellScriptBin; +let inherit (pkgs.third_party) google-cloud-sdk tree writeShellScriptBin; in (writeShellScriptBin "pass" '' set -eo pipefail |