Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 1 addition & 32 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -163,38 +163,7 @@ rec {
};
};

projects = make-projects raw-projects;

# TODO: remove after migrating to modules
# ===

raw-projects-new = import ./projects/default-module.nix {
inherit lib;
pkgs = pkgs // ngipkgs;
sources = {
inputs = sources;
modules = nixos-modules;
inherit examples;
};
};

# TODO: delete the file after migrating to modules
projects-new = make-projects raw-projects-new.config.projects;

# TODO:
# ===

project-models = import ./projects/models.nix { inherit lib pkgs sources; };

# we mainly care about the types being checked
templates.project =
let
project-metadata =
(project-models.project (import ./maintainers/templates/project { inherit lib pkgs sources; }))
.metadata;
in
# fake derivation for flake check
pkgs.writeText "dummy" (lib.strings.toJSON project-metadata);
projects = make-projects raw-projects.config.projects;

# TODO: find a better place for this
make-projects =
Expand Down
19 changes: 1 addition & 18 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 12 additions & 33 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
inputs.sops-nix.url = "github:Mic92/sops-nix";
inputs.buildbot-nix.inputs.nixpkgs.follows = "nixpkgs";
inputs.buildbot-nix.url = "github:nix-community/buildbot-nix";
inputs.yants.url = "git+https://code.tvl.fyi/depot.git:/nix/yants.git";
inputs.yants.flake = false;

# See <https://github.com/ngi-nix/ngipkgs/issues/24> for plans to support Darwin.
inputs.systems.url = "github:nix-systems/default-linux";
Expand Down Expand Up @@ -79,36 +77,18 @@
in
rec {
packages = ngipkgs // {
overview =
let
overview-new = import ./overview {
inherit
lib
lib'
self
nixpkgs
system
;
pkgs = pkgs // ngipkgs;
projects = classic.projects-new;
options = optionsDoc.optionsNix;
};
overview-old = import ./overview {
inherit
lib
lib'
self
nixpkgs
system
;
pkgs = pkgs // ngipkgs;
projects = ngiProjects;
options = optionsDoc.optionsNix;
};
in
# TODO: switch to overview-new
assert overview-old == overview-new;
overview-old;
overview = import ./overview {
inherit
lib
lib'
self
nixpkgs
system
;
pkgs = pkgs // ngipkgs;
projects = classic.projects;
options = optionsDoc.optionsNix;
};

options =
pkgs.runCommand "options.json"
Expand Down Expand Up @@ -169,7 +149,6 @@
};
"infra/makemake" = toplevel self.nixosConfigurations.makemake;
"infra/overview" = self.packages.${system}.overview;
"infra/templates" = classic.templates.project;
};
in
checksForInfrastructure // checksForAllProjects // checksForAllPackages;
Expand Down
130 changes: 0 additions & 130 deletions projects/default-module.nix

This file was deleted.

Loading