diff options
| author | Vincent Ambo <tazjin@google.com> | 2019-12-09T03·36+0000 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2019-12-09T03·36+0000 |
| commit | 7da979124f9f8229ef6a56856f4b36d0d7f89676 (patch) | |
| tree | 626bdfb63492dda26ee076b1579a51a166ed06fd | |
| parent | 998a2ceb17f6b2d29c1c3e02cd536e2af4ceee9c (diff) | |
fix(third_party): Expose various other missing dependencies r/108
| -rw-r--r-- | overrides/buildGo.nix | 2 | ||||
| -rw-r--r-- | overrides/elmPackages.nix | 2 | ||||
| -rw-r--r-- | overrides/lispPackages/default.nix | 2 | ||||
| -rw-r--r-- | services/gemma/default.nix | 4 | ||||
| -rw-r--r-- | third_party/default.nix | 5 |
5 files changed, 10 insertions, 5 deletions
diff --git a/overrides/buildGo.nix b/overrides/buildGo.nix index 8d46321b6f5c..aa6cd415dfa8 100644 --- a/overrides/buildGo.nix +++ b/overrides/buildGo.nix @@ -3,4 +3,4 @@ (import "${builtins.fetchGit { url = "https://github.com/tazjin/buildGo.nix"; rev = "28e587b348a8aaa7af00a004c05286af9d35ca9a"; -}}/buildGo.nix") { pkgs = pkgs.third_party.nixpkgs; } +}}/buildGo.nix") { pkgs = pkgs.third_party; } diff --git a/overrides/elmPackages.nix b/overrides/elmPackages.nix index 3df44420a6bb..20026d9180ea 100644 --- a/overrides/elmPackages.nix +++ b/overrides/elmPackages.nix @@ -2,7 +2,7 @@ # the newer version is a lot of effort. { pkgs, ... }: -(import (pkgs.fetchFromGitHub { +(import (pkgs.third_party.fetchFromGitHub { owner = "NixOS"; repo = "nixpkgs"; rev = "14f9ee66e63077539252f8b4550049381a082518"; diff --git a/overrides/lispPackages/default.nix b/overrides/lispPackages/default.nix index 175c807ec212..c6502975e310 100644 --- a/overrides/lispPackages/default.nix +++ b/overrides/lispPackages/default.nix @@ -4,5 +4,5 @@ import ./quicklisp.nix { inherit (pkgs) lib; - inherit (pkgs.third_party.nixpkgs) lispPackages; + inherit (pkgs.third_party) lispPackages; } diff --git a/services/gemma/default.nix b/services/gemma/default.nix index 5b211422de92..f48af489217a 100644 --- a/services/gemma/default.nix +++ b/services/gemma/default.nix @@ -1,8 +1,8 @@ { pkgs, ... }: let - inherit (pkgs) lispPackages; - inherit (pkgs.third_party.nixpkgs) stdenv sbcl elmPackages makeWrapper openssl; + inherit (pkgs) elmPackages lispPackages; + inherit (pkgs.third_party) stdenv sbcl makeWrapper openssl; frontend = stdenv.mkDerivation { name = "gemma-frontend"; diff --git a/third_party/default.nix b/third_party/default.nix index ad77ed98c0e7..adb96d73ed2b 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -41,15 +41,20 @@ let iana-etc jq lib + lispPackages llvmPackages + makeWrapper mdbook nix openssh + openssl + protobuf remarshal rsync runCommand rustPlatform rustc + sbcl stdenv symlinkJoin terraform_0_12 |