From 24e81d5ce81881089ac757495ab5e0bcf7d5df79 Mon Sep 17 00:00:00 2001 From: DavHau Date: Tue, 7 Nov 2023 19:07:00 +0700 Subject: [PATCH] examples: rename repo examples --- README.md | 4 +-- examples/repo-single-package/flake.nix | 28 ------------------- .../flake.nix | 0 .../packages/hello/default.nix | 0 .../.project-root | 0 .../{repo => repo-with-packages}/default.nix | 0 .../packages/hello/default.nix | 0 modules/flake-parts/examples.nix | 12 ++++---- modules/flake-parts/site/src/examples.md | 4 +-- 9 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 examples/repo-single-package/flake.nix rename examples/{repo-flake => repo-with-packages-flake}/flake.nix (100%) rename examples/{repo-flake => repo-with-packages-flake}/packages/hello/default.nix (100%) rename examples/{repo => repo-with-packages}/.project-root (100%) rename examples/{repo => repo-with-packages}/default.nix (100%) rename examples/{repo => repo-with-packages}/packages/hello/default.nix (100%) diff --git a/README.md b/README.md index 76db6536..007e36f8 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ Automate reproducible packaging for various language ecosystems
Documentation | - Example Repo | - Example Repo Flake | + Example Repo | + Example Repo Flake | Example Packages

diff --git a/examples/repo-single-package/flake.nix b/examples/repo-single-package/flake.nix deleted file mode 100644 index 1e46fd97..00000000 --- a/examples/repo-single-package/flake.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - description = "My flake with dream2nix packages"; - - inputs = { - dream2nix.url = "github:nix-community/dream2nix"; - nixpkgs.follows = "dream2nix/nixpkgs"; - }; - - outputs = inputs @ { - self, - dream2nix, - nixpkgs, - ... - }: let - system = "x86_64-linux"; - in { - # all packages defined inside ./packages/ - packages.${system}.default = nixpkgs.lib.evalModules { - modules = []; - - projectRoot = ./.; - # can be changed to ".git" or "flake.nix" to get rid of .project-root - projectRootFile = "flake.nix"; - packagesDir = ./packages; - packageSets.nixpkgs = nixpkgs.legacyPackages.${system}; - }; - }; -} diff --git a/examples/repo-flake/flake.nix b/examples/repo-with-packages-flake/flake.nix similarity index 100% rename from examples/repo-flake/flake.nix rename to examples/repo-with-packages-flake/flake.nix diff --git a/examples/repo-flake/packages/hello/default.nix b/examples/repo-with-packages-flake/packages/hello/default.nix similarity index 100% rename from examples/repo-flake/packages/hello/default.nix rename to examples/repo-with-packages-flake/packages/hello/default.nix diff --git a/examples/repo/.project-root b/examples/repo-with-packages/.project-root similarity index 100% rename from examples/repo/.project-root rename to examples/repo-with-packages/.project-root diff --git a/examples/repo/default.nix b/examples/repo-with-packages/default.nix similarity index 100% rename from examples/repo/default.nix rename to examples/repo-with-packages/default.nix diff --git a/examples/repo/packages/hello/default.nix b/examples/repo-with-packages/packages/hello/default.nix similarity index 100% rename from examples/repo/packages/hello/default.nix rename to examples/repo-with-packages/packages/hello/default.nix diff --git a/modules/flake-parts/examples.nix b/modules/flake-parts/examples.nix index d4b637fc..f8d7086f 100644 --- a/modules/flake-parts/examples.nix +++ b/modules/flake-parts/examples.nix @@ -62,9 +62,9 @@ in { // { # add repo templates repo.description = "Dream2nix repo without flakes"; - repo.path = ../../examples/repo; + repo.path = ../../examples/repo-with-packages; repo-flake.description = "Dream2nix repo with flakes"; - repo-flake.path = ../../examples/repo-flake; + repo-flake.path = ../../examples/repo-with-packages-flake; }; perSystem = { @@ -86,17 +86,17 @@ in { ( (lib.mapAttrs (_: flakeFile: getPackage flakeFile) allExamples) // { - example-repo = let + repo-with-packages = let imported = - (import ../../examples/repo { + (import ../../examples/repo-with-packages { dream2nixSource = ../..; inherit pkgs; }) .hello; in imported; - example-repo-flake = - (importFlake ../../examples/repo-flake/flake.nix).packages.${system}.hello; + repo-with-packages-flake = + (importFlake ../../examples/repo-with-packages-flake/flake.nix).packages.${system}.hello; } ); diff --git a/modules/flake-parts/site/src/examples.md b/modules/flake-parts/site/src/examples.md index 07692ad0..2f866433 100644 --- a/modules/flake-parts/site/src/examples.md +++ b/modules/flake-parts/site/src/examples.md @@ -1,7 +1,7 @@ # Examples for dream2nix -- [👉 example repository](https://github.com/nix-community/dream2nix/tree/main/examples/repo) -- [👉 example repository using flakes](https://github.com/nix-community/dream2nix/tree/main/examples/repo-flake) +- [👉 example repository](https://github.com/nix-community/dream2nix/tree/main/examples/repo-with-packages) +- [👉 example repository using flakes](https://github.com/nix-community/dream2nix/tree/main/examples/repo-with-packages-flake) - [👉 example packages](https://github.com/nix-community/dream2nix/tree/main/examples/packages) - [👉 basics](https://github.com/nix-community/dream2nix/tree/main/examples/packages/basics) - [👉 single-language](https://github.com/nix-community/dream2nix/tree/main/examples/packages/single-language)