Skip to content

Commit

Permalink
refactor: move development inputs/outputs back to dev flake
Browse files Browse the repository at this point in the history
warning: updating lock file '/home/seth/repos/ctp-nix/flake.lock':
• Removed input 'catppuccin-v1_1'
• Removed input 'catppuccin-v1_2'
• Removed input 'home-manager'
• Removed input 'home-manager/nixpkgs'
• Removed input 'home-manager-stable'
• Removed input 'home-manager-stable/nixpkgs'
• Removed input 'nixpkgs-stable'
• Removed input 'nuscht-search'
• Removed input 'nuscht-search/flake-utils'
• Removed input 'nuscht-search/flake-utils/systems'
• Removed input 'nuscht-search/ixx'
• Removed input 'nuscht-search/ixx/flake-utils'
• Removed input 'nuscht-search/ixx/nixpkgs'
• Removed input 'nuscht-search/nixpkgs'

warning: creating lock file '/home/seth/repos/ctp-nix/dev/flake.lock':
• Added input 'catppuccin':
    'path:../.'
• Added input 'catppuccin/nixpkgs':
    'github:NixOS/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d?narHash=sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs%2BrI%3D' (2025-01-04)
• Added input 'catppuccin-v1_1':
    'https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz?narHash=sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68%3D' (2024-12-13)
• Added input 'catppuccin-v1_2':
    'https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.1/0193e646-1107-7f69-a402-f2a3988ecf1d/source.tar.gz?narHash=sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek%3D' (2024-12-20)
• Added input 'flake-utils':
    'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b?narHash=sha256-l0KFg5HjrsfsO/JpG%2Br7fRrqm12kzFHyUHqHCVpMMbI%3D' (2024-11-13)
• Added input 'flake-utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e?narHash=sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768%3D' (2023-04-09)
• Added input 'home-manager':
    'github:nix-community/home-manager/a0046af169ce7b1da503974e1b22c48ef4d71887?narHash=sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI%3D' (2025-01-17)
• Added input 'home-manager/nixpkgs':
    follows 'nixpkgs'
• Added input 'home-manager-stable':
    'github:nix-community/home-manager/bd65bc3cde04c16755955630b344bc9e35272c56?narHash=sha256-dinzAqCjenWDxuy%2BMqUQq0I4zUSfaCvN9rzuCmgMZJY%3D' (2025-01-08)
• Added input 'home-manager-stable/nixpkgs':
    follows 'nixpkgs-stable'
• Added input 'nixpkgs':
    follows 'catppuccin/nixpkgs'
• Added input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/e24b4c09e963677b1beea49d411cd315a024ad3a?narHash=sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ%3D' (2025-01-15)
• Added input 'nuscht-search':
    'github:NuschtOS/search/836908e3bddd837ae0f13e215dd48767aee355f0?narHash=sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c%3D' (2025-01-02)
• Added input 'nuscht-search/flake-utils':
    follows 'flake-utils'
• Added input 'nuscht-search/ixx':
    'github:NuschtOS/ixx/9fd01aad037f345350eab2cd45e1946cc66da4eb?narHash=sha256-EiOq8jF4Z/zQe0QYVc3%2BqSKxRK//CFHMB84aYrYGwEs%3D' (2024-10-26)
• Added input 'nuscht-search/ixx/flake-utils':
    follows 'nuscht-search/flake-utils'
• Added input 'nuscht-search/ixx/nixpkgs':
    follows 'nuscht-search/nixpkgs'
• Added input 'nuscht-search/nixpkgs':
    follows 'nixpkgs'
  • Loading branch information
getchoo committed Jan 17, 2025
1 parent f06fcad commit b94882b
Show file tree
Hide file tree
Showing 8 changed files with 415 additions and 359 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ on:
push:
branches: [ main ]
paths:
- '**.lock'
- '**.nix'
- 'flake.lock'
- 'pkgs/**'

- '.github/workflows/ci.yml'
pull_request:
paths:
- '**.lock'
- '**.nix'
- 'flake.lock'
- 'pkgs/**'

- '.github/workflows/ci.yml'
workflow_dispatch:
Expand All @@ -33,6 +35,10 @@ jobs:

- name: Install Nix
uses: cachix/install-nix-action@V27
with:
# TODO: Remove when Nix 2.26 is released
# https://hydra.nixos.org/build/285560910
install_url: https://hydra.nixos.org/build/285560910/download/1/install

- name: Install Cachix
uses: cachix/cachix-action@v15
Expand All @@ -42,7 +48,7 @@ jobs:

- name: Run build
run: |
nix run .#build-outputs -- 'packages'
nix run ./dev#build-outputs -- 'packages'
modules:
name: Test Modules
Expand All @@ -61,6 +67,10 @@ jobs:

- name: Install Nix
uses: cachix/install-nix-action@V27
with:
# TODO: Remove when Nix 2.26 is released
# https://hydra.nixos.org/build/285560910
install_url: https://hydra.nixos.org/build/285560910/download/1/install

- name: Install Cachix
uses: cachix/cachix-action@v15
Expand All @@ -70,7 +80,7 @@ jobs:

- name: Run tests
run: |
nix run .#build-outputs -- 'checks'
nix run ./dev#build-outputs -- 'checks'
release-gate:
name: Release Gate
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches: [ main ]
paths:
- "**.nix"
- "**.lock"

- ".github/workflows/format.yml"
workflow_dispatch:
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,20 @@ on:
push:
branches: [main]
paths:
- 'docs/**'
- 'CHANGELOG.md'
- '**.lock'
- '**.nix'
- 'docs/**'
- 'pkgs/**'
- 'CHANGELOG.md'

- '.github/workflows/website.yml'
pull_request:
paths:
- 'docs/**'
- 'CHANGELOG.md'
- '**.lock'
- '**.nix'
- 'docs/**'
- 'pkgs/**'
- 'CHANGELOG.md'

- '.github/workflows/website.yml'
workflow_dispatch:
Expand All @@ -32,6 +34,10 @@ jobs:

- name: Install Nix
uses: cachix/install-nix-action@V27
with:
# TODO: Remove when Nix 2.26 is released
# https://hydra.nixos.org/build/285560910
install_url: https://hydra.nixos.org/build/285560910/download/1/install

- name: Install Cachix
uses: cachix/cachix-action@v15
Expand All @@ -44,7 +50,7 @@ jobs:
nix build \
--print-build-logs \
--show-trace \
'.#site'
'./dev#site'
- name: Get artifact directory
id: find-path
Expand Down
4 changes: 4 additions & 0 deletions dev/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
> [!WARNING]
> This is using features from the currently unstable Nix 2.26 release.
> ***It will not evaluate on versions prior to 2.26***.
> It is recommended to enter a shell with it by running `nix shell 'github:NixOS/nix/043df13f724cc084a805372b0455cc6d8684cd5b#nix-cli'`
220 changes: 220 additions & 0 deletions dev/flake.lock

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

Loading

0 comments on commit b94882b

Please sign in to comment.