Merge pull request #21 from tsandrini/version-bump

v1.0.0-b1

.cz.toml

@@ -0,0 +1,6 @@
+[tool.commitizen]
+name = "cz_conventional_commits"
+tag_format = "$version"
+version_scheme = "semver"
+version_provider = "cargo"
+update_changelog_on_bump = true

.github/workflows/flake-check.yml

@@ -31,12 +31,16 @@ jobs:
       - name: "Setting up packages..."
         run: |
           nix profile install nixpkgs#nix-fast-build # parallel nix builder
+          nix profile install nixpkgs#cargo-audit # Audit Cargo.lock files for crates with security vulnerabilities
 
       - name: "Running `nix flake check`..."
         run: nix-fast-build --skip-cached --no-nom
 
       - name: "Running `nix build ...`..."
         run: nix-fast-build --skip-cached --no-nom --flake ".#packages"
 
+      - name: "Running cargo-audit"
+        run: cargo-audit audit
+
       - name: "Checking flake inputs for stale & insecure nixpkgs versions..."
         uses: DeterminateSystems/flake-checker-action@main

CHANGELOG.md

@@ -1,5 +1,117 @@
 # Changelog
 
+## 1.0.0-b1 (2024-08-01)
+
+### Feat
+
+- **flake-parts**: add parallelism to gh-actions
+- **flake**: move builder tests to a flake check
+- **flake**: add cargo test to checkPhase
+- **flake-parts**: add manual dispatch to gh CI
+- **docs**: add cargo doc package
+- **flake-parts**: add gh-actions-cachix part
+- **builder**: improve perf by making meta pure
+- **flake-parts**: add nix-topology
+- **flake**: update cargoSha256
+- **builder**: implement add command
+- **builder**: add unresolved dependencies error
+- **buider**: add recursive dependencies resolver
+- **builder**: add proper _bootstrap to list cmd
+- **builder**: nixfmt, _bootstrap, parts tuples
+- **flake**: fill meta attrs, fix builder src
+- **builder**: visually distiguish collections
+- **flake-parts**: add README.md to bootstrap
+- **flake-parts**: add flake-parts collections
+- **flake-parts**: add gh-actions-flakehub
+- **flake-parts**: add gh-actions-check
+- **flake-parts**: add gh-actions-flake-update
+- **flake-parts**: add gh-actions-pages
+- **flake-parts**: add gh-template-PR
+- **flake-parts**: add gh-templates-issues
+- **flake-parts**: add gitlab-ci-check
+- **builder**: remove itertools requirement
+- **builder**: separate nix cli & flake-inputs template
+- **builder**: add flake.nix inputs template to init
+- **flake-parts**: add process-compose to generic .envrc
+- **builder**: separate constant into a config mod
+- **builder**: switch anyhow with color-eyre
+- **builder**: add fs_utils & init finalization
+- **builder**: add regex dep
+- **builder**: decouple & modularize src
+- **flake-parts**: create one modular unified .envrc
+- **builder**: add diff,fs_extra,walkdir crates
+- **builder**: move parts parsing into a fun
+- **builder**: complete init cmd parts parsing
+- **builder**: add itertools dependency
+- **flake-parts**: add home-manager related parts
+- **flake-parts**: add agenix part
+- **flake-parts**: add git pre-commit-hooks part
+- **feat-parts**: add numtide binary cache to treefmt
+- **flake-parts**: add conditional process-compose to shells
+- **flake-parts**: add process-compose-flake part
+- **builder**: update parts.rs
+- **devshell**: update devshell & add direnv integration
+- **flake-parts**: add shells, process-compose and update treefmt
+- **flake-parts**: add treefmt,devenv
+- **parts**: add flake-root,overlays,nixos-hosts,lib
+- **parts**: add _base skeleton, pkgs, nixos parts
+- **parts**: add more descriptive errors & update structs
+- **builder**: separate CLI logic from parts parsing
+- **project**: init new builder & parts & derivations
+- **project**: init v1 builder rewrite
+- **flake**: update inputs & treefmt settings patch
+- **treefmt**: update defaults
+- **devenv**: update to v1 & add examples & remove impurities
+- **flake**: update flake inputs
+- **.envrc**: update nix-direnv to version 3
+- **flake**: update inputs & reformat
+- **envrc**: add --accept-flake-config flag to templates
+- **flake**: update inputs
+
+### Fix
+
+- **version**: add cz & fix version number
+- **gh-workflows**: fix nix-fast-build args
+- **flake**: update builder cargoSha256
+- **cachix-push**: fix version main -> v15
+- **builder**: correct SELF_FLAKE_URI
+- **builder**: fix cmd.path parsing
+- **builder**: fix conflict resolution in init
+- **builder**: update temporarily SELF_FLAKE_URI
+- **flake**: correct cargoHash
+- **builder**: fix merging strats and force flag
+- **builder**: tweak template whitespacing
+- **builder**: fix flake.nix template rendering
+- **flake-parts**: fix process-compose-flake structure
+- **flake-parts**: fix minor flake-parts issues
+- **flake-parts**: fix small discovered bugs
+- **flake-parts**: fix flake-root dir structure
+- **flake-parts**: fix conditional treefmt in devenv part
+- **envrc**: fix incorrent devshell watch filename
+
+### Refactor
+
+- **flake**: move docs directly to builder drv
+- **builder**: fix flake.nix.tmpl formatting
+- **builder**: update flake.nix tmpl comment
+- **builder**: separate shared cli args
+- **builder**: decouple tmpl into templates.rs
+- **builder**: move missing,conflicting parts
+- **flake**: localize using callPackage pattern
+- **flake-parts**: remove redundant .gitignore
+- **builder**: decouple init()
+- **builder**: remove redundant format_module fun
+- **builder**: remove redundant .gitignore
+- **flake-parts**: rename _base -> _bootstrap
+- **devshell**: remove WIP rust from devshell
+- **main.rs**: rename cli options
+- **parts.rs**: remove redundant temporary anyhow
+- **flake**: remove .code-workspace vscode file
+- **flake-parts**: rename parts -> flake-parts
+- **parts**: rename parts -> flake-parts
+- **formatting**: switch to nixfmt-rfc-style
+- **modules**: use module functors to localize inputs instead of global ones
+
 ## 0.2.0 (2024-01-06)
 
 ### Feat (0.2.0)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake-parts-builder"
-version = "1.0.0"
+version = "1.0.0-b1"
 edition = "2021"
 authors = ["Tomáš Sandrini"]
 repository = "https://github.com/tsandrini/flake-parts-builder"

flake-parts/devenv/flake-parts/devenv/default.nix

@@ -11,10 +11,14 @@
       ...
     }:
     {
-      devenv.shells.dev = import ./dev.nix {
-        inherit pkgs system;
-        inherit (inputs) devenv-root;
-        treefmt-wrapper = if (lib.hasAttr "treefmt" config) then config.treefmt.build.wrapper else null;
+      devenv.shells = {
+        default = config.devenv.shells.dev;
+
+        dev = import ./dev.nix {
+          inherit pkgs system;
+          inherit (inputs) devenv-root;
+          treefmt-wrapper = if (lib.hasAttr "treefmt" config) then config.treefmt.build.wrapper else null;
+        };
       };
     };
 }

flake-parts/process-compose-flake/flake-parts/process-compose-flake/default.nix

@@ -4,10 +4,10 @@
   imports = with inputs; [ process-compose-flake.flakeModule ];
 
   perSystem =
-    { pkgs, ... }:
+    { config, pkgs, ... }:
     {
-      process-compose = rec {
-        default = dev-process;
+      process-compose = {
+        default = config.process-compose.dev-process;
 
         dev-process = import ./dev.nix { inherit pkgs lib; };
       };

flake-parts/shells/flake-parts/shells/default.nix

@@ -4,8 +4,8 @@
   perSystem =
     { pkgs, config, ... }:
     {
-      devShells = rec {
-        default = dev;
+      devShells = {
+        default = config.devShells.dev;
 
         dev = pkgs.callPackage ./dev.nix {
           inherit lib;

flake.nix

@@ -25,7 +25,7 @@
         let
           finalArgs = {
             name = "flake-parts";
-            version = "1.0.0";
+            version = "1.0.0-b1";
 
             dontConfigure = true;
             dontBuild = true;
@@ -97,7 +97,7 @@
                   }:
                   rustPlatform.buildRustPackage {
                     name = "flake-parts-builder";
-                    version = "1.0.0";
+                    version = "1.0.0-b1";
 
                     src = [
                       ./src
@@ -132,7 +132,7 @@
                       export HOME=$TMPDIR/home
                     '';
 
-                    cargoSha256 = "sha256-vMnU9PVZz61Tp/W9Rz4FPePyXYqzPAKsk9XAFc4rfo8=";
+                    cargoSha256 = "sha256-Rhc9Zxf8YMXRsxQJzcRfRhe02hcQ3XrxyDzcaYBpy0E=";
 
                     postBuild = ''
                       cargo doc --no-deps --release
@@ -177,7 +177,7 @@
                   mkFlakeParts {
                     inherit stdenv;
                     name = "flake-parts";
-                    version = "1.0.0";
+                    version = "1.0.0-b1";
                     src = ./flake-parts;
 
                     meta = with lib; {
@@ -203,7 +203,7 @@
                   mkFlakeParts {
                     inherit stdenv;
                     name = "flake-parts-bootstrap";
-                    version = "1.0.0";
+                    version = "1.0.0-b1";
                     src = ./flake-parts-bootstrap;
 
                     meta = with lib; {