diff options
| author | Vincent Ambo <tazjin@google.com> | 2019-12-09T02·40+0000 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2019-12-09T02·40+0000 |
| commit | 01bad09eedc97c1437b5bbe4910f6b3b13b23ca0 (patch) | |
| tree | 212cf4c82edfda475bba67bafbd4e793c28e24eb /services | |
| parent | 688233acac967178588943061992455b91cbda03 (diff) | |
refactor: Introduce new layout with nixpkgs in third_party r/100
This is not the final layout yet, but makes it so that my top-level attribute set is no longer overlaid into nixpkgs itself. This is useful for other people who are importing my monorepo.
Diffstat (limited to 'services')
| -rw-r--r-- | services/gemma/default.nix | 3 | ||||
| -rw-r--r-- | services/tazblog/default.nix | 2 | ||||
| -rw-r--r-- | services/tazblog/shell.nix | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/services/gemma/default.nix b/services/gemma/default.nix index ea10a4c7d0..5b211422de 100644 --- a/services/gemma/default.nix +++ b/services/gemma/default.nix @@ -1,7 +1,8 @@ { pkgs, ... }: let - inherit (pkgs) stdenv sbcl lispPackages elmPackages makeWrapper openssl; + inherit (pkgs) lispPackages; + inherit (pkgs.third_party.nixpkgs) stdenv sbcl elmPackages makeWrapper openssl; frontend = stdenv.mkDerivation { name = "gemma-frontend"; diff --git a/services/tazblog/default.nix b/services/tazblog/default.nix index 4d9608838d..41838e7605 100644 --- a/services/tazblog/default.nix +++ b/services/tazblog/default.nix @@ -5,7 +5,7 @@ { pkgs, ... }: let - inherit (pkgs) writeShellScriptBin haskell; + inherit (pkgs.third_party.nixpkgs) writeShellScriptBin haskell; tazblog = haskell.packages.ghc865.callPackage ./tazblog.nix {}; wrapper = writeShellScriptBin "tazblog" '' export PORT=8000 diff --git a/services/tazblog/shell.nix b/services/tazblog/shell.nix index 021c3db31d..ebb891a874 100644 --- a/services/tazblog/shell.nix +++ b/services/tazblog/shell.nix @@ -1,4 +1,4 @@ -{ pkgs ? import ../../default.nix {} }: +{ pkgs ? (import ../../default.nix {}).third_party.nixpkgs }: let tazblog = import ./tazblog.nix; depNames = with builtins; filter ( |