refactor: Introduce new layout with nixpkgs in third_party
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.
This commit is contained in:
parent
688233acac
commit
01bad09eed
10 changed files with 61 additions and 49 deletions
64
default.nix
64
default.nix
|
@ -1,5 +1,6 @@
|
|||
# This file sets up the top-level package set by merging all local packages into
|
||||
# the nixpkgs top-level.
|
||||
# This file sets up the top-level package set by traversing the package tree
|
||||
# (see read-tree.nix for details) and constructing a matching attribute set
|
||||
# tree.
|
||||
#
|
||||
# This makes packages accessible via the Nixery instance that is configured to
|
||||
# use this repository as its nixpkgs source.
|
||||
|
@ -7,14 +8,9 @@
|
|||
with builtins;
|
||||
|
||||
let
|
||||
# The pinned commit here is identical to the public nixery.dev
|
||||
# version, since popularity data has been generated for that.
|
||||
stableCommit = "80b42e630b23052d9525840a9742100a2ceaaa8f";
|
||||
stableSrc = fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs-channels/archive/${stableCommit}.tar.gz";
|
||||
sha256 = "0243qiivxl3z51biy4f5y5cy81x5bki5dazl9wqwgnmd373gpmxy";
|
||||
};
|
||||
readTree = import ./read-tree.nix;
|
||||
# This definition of fix is identical to <nixpkgs>.lib.fix, but the global
|
||||
# package set is not available here.
|
||||
fix = f: let x = f x; in x;
|
||||
|
||||
# Derivations that have `meta.enableCI` set to `true` should be
|
||||
# built by the CI system on every commit. This code implements
|
||||
|
@ -25,10 +21,9 @@ let
|
|||
ciCondition = _: x: (!isDerivation x) || ((x ? meta.enableCI) && (x.meta.enableCI));
|
||||
in collect isDerivation (filterAttrsRecursive ciCondition pkgs);
|
||||
|
||||
repoPkgs = self: super:
|
||||
let config = {
|
||||
pkgs = self;
|
||||
upstream = super;
|
||||
# Global configuration that all packages are called with.
|
||||
config = pkgs: {
|
||||
inherit pkgs;
|
||||
|
||||
kms = {
|
||||
project = "tazjins-infrastructure";
|
||||
|
@ -37,21 +32,32 @@ let
|
|||
key = "kontemplate-key";
|
||||
};
|
||||
};
|
||||
in {
|
||||
services = readTree ./services config;
|
||||
tools = readTree ./tools config;
|
||||
third_party = readTree ./third_party config;
|
||||
}
|
||||
# Load overrides into the top-level:
|
||||
// (readTree ./overrides config)
|
||||
|
||||
readTree' = import ./read-tree.nix;
|
||||
|
||||
localPkgs = readTree: {
|
||||
services = readTree ./services;
|
||||
tools = readTree ./tools;
|
||||
third_party = readTree ./third_party;
|
||||
};
|
||||
in fix(self: {
|
||||
config = config self;
|
||||
|
||||
# Elevate 'lib' from nixpkgs
|
||||
lib = self.third_party.nixpkgs.lib;
|
||||
|
||||
# Collect all projects that should be built by CI
|
||||
// {
|
||||
ciProjects = (filterCI super.lib self.services)
|
||||
ciProjects = (filterCI self.lib self.services)
|
||||
++ (filterCI super.lib self.tools)
|
||||
++ (filterCI super.lib self.third_party);
|
||||
};
|
||||
in { ... } @ args: import stableSrc (args // {
|
||||
overlays = [ repoPkgs ];
|
||||
config.allowUnfree = true;
|
||||
config.allowBroken = true;
|
||||
})
|
||||
}
|
||||
|
||||
# Add local packages as structured by readTree
|
||||
// (localPkgs (readTree' self.config))
|
||||
|
||||
# Load overrides into the top-level.
|
||||
#
|
||||
# This can be used to move things from third_party into the top-level, too (such
|
||||
# as `lib`).
|
||||
// (readTree' self.config) ./overrides
|
||||
)
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
import "${builtins.fetchGit {
|
||||
{ pkgs, ... }:
|
||||
|
||||
(import "${builtins.fetchGit {
|
||||
url = "https://github.com/tazjin/buildGo.nix";
|
||||
rev = "28e587b348a8aaa7af00a004c05286af9d35ca9a";
|
||||
}}/buildGo.nix"
|
||||
}}/buildGo.nix") { pkgs = pkgs.third_party.nixpkgs; }
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# One of Gemma's dependencies is missing in nixpkgs' Quicklisp
|
||||
# package set, it is overlaid locally here.
|
||||
{ pkgs, upstream, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
import ./quicklisp.nix {
|
||||
inherit (pkgs) lib;
|
||||
inherit (upstream) lispPackages;
|
||||
inherit (pkgs.third_party.nixpkgs) lispPackages;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
initPath: { pkgs, ... } @ args:
|
||||
# TODO(tazjin): if there's a default.nix, keep traversing but don't import .nix files?
|
||||
# TODO(tazjin): avoid {} by only calling functions *after* checking what they are
|
||||
|
||||
args: initPath:
|
||||
|
||||
let
|
||||
inherit (builtins)
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs ? import ../../default.nix {} }:
|
||||
{ pkgs ? (import ../../default.nix {}).third_party.nixpkgs }:
|
||||
|
||||
let tazblog = import ./tazblog.nix;
|
||||
depNames = with builtins; filter (
|
||||
|
|
2
third_party/naersk.nix
vendored
2
third_party/naersk.nix
vendored
|
@ -1,6 +1,6 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
let inherit (pkgs) callPackage fetchFromGitHub;
|
||||
let inherit (pkgs.third_party.nixpkgs) callPackage fetchFromGitHub;
|
||||
in callPackage (fetchFromGitHub {
|
||||
owner = "nmattia";
|
||||
repo = "naersk";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
pkgs.buildGoPackage {
|
||||
pkgs.third_party.nixpkgs.buildGoPackage {
|
||||
name = "blog_cli";
|
||||
goPackagePath = "github.com/tazjin/personal/blog_cli";
|
||||
src = ./.;
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
{ pkgs, kms, ... }:
|
||||
|
||||
let inherit (pkgs) google-cloud-sdk tree writeShellScriptBin;
|
||||
let inherit (pkgs.third_party.nixpkgs) google-cloud-sdk tree writeShellScriptBin;
|
||||
in (writeShellScriptBin "pass" ''
|
||||
set -eo pipefail
|
||||
|
||||
|
|
Loading…
Reference in a new issue