Repository navigation
Separate out a dev flake #1046
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
chvp
wants to merge
1
commit into
main
Choose a base branch
from
chore/separate-dev-flake
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Separate out a dev flake #1046
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| watch_file flake.lock | ||
| watch_file flake.nix | ||
| watch_file gemset.nix | ||
| use_flake ./dev |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,65 @@ | ||
| { stdenv | ||
| , lib | ||
| , accentor-api-env | ||
| { | ||
| stdenv, | ||
| lib, | ||
| ruby_4_0, | ||
| bundlerEnv, | ||
| }: | ||
|
|
||
| let | ||
| rootFiles = lib.fileset.fileFilter (file: builtins.elem file.name [ "config.ru" "Gemfile" "Gemfile.lock" "gemset.nix" "Rakefile" ]) ./.; | ||
| srcFiles = lib.fileset.unions [ rootFiles ./app ./bin ./config ./db ./lib ./public ]; | ||
| rootFiles = lib.fileset.fileFilter ( | ||
| file: | ||
| builtins.elem file.name [ | ||
| "config.ru" | ||
| "Gemfile" | ||
| "Gemfile.lock" | ||
| "gemset.nix" | ||
| "Rakefile" | ||
| ] | ||
| ) ./.; | ||
| srcFiles = lib.fileset.unions [ | ||
| rootFiles | ||
| ./app | ||
| ./bin | ||
| ./config | ||
| ./db | ||
| ./lib | ||
| ./public | ||
| ]; | ||
| ruby = ruby_4_0.override { jemallocSupport = true; }; | ||
| gems = bundlerEnv { | ||
| inherit ruby; | ||
| name = "accentor-api-env"; | ||
| gemfile = ./Gemfile; | ||
| lockfile = ./Gemfile.lock; | ||
| gemset = ./gemset.nix; | ||
| groups = [ | ||
| "default" | ||
| "development" | ||
| "test" | ||
| "production" | ||
| ]; | ||
| }; | ||
| in | ||
| stdenv.mkDerivation { | ||
| pname = "accentor-api"; | ||
| version = "0.24.0"; | ||
| src = lib.fileset.toSource { root = ./.; fileset = srcFiles; }; | ||
| src = lib.fileset.toSource { | ||
| root = ./.; | ||
| fileset = srcFiles; | ||
| }; | ||
|
|
||
| buildPhase = '' | ||
| # Compile bootsnap cache | ||
| ${accentor-api-env}/bin/bundle exec bootsnap precompile --gemfile app/ lib/ | ||
| ${gems}/bin/bundle exec bootsnap precompile --gemfile app/ lib/ | ||
| ''; | ||
|
|
||
| installPhase = '' | ||
| mkdir $out | ||
| cp -r * $out | ||
| ''; | ||
|
|
||
| passthru.env = accentor-api-env; | ||
| passthru = { | ||
| inherit ruby; | ||
| env = gems; | ||
| }; | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| { | ||
| description = "Accentor API development"; | ||
|
|
||
| inputs = { | ||
| super = { | ||
| url = "../"; | ||
| inputs.nixpkgs.follows = "nixpkgs"; | ||
| }; | ||
| nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst"; | ||
| bundix = { | ||
| url = "github:inscapist/bundix"; | ||
| inputs.nixpkgs.follows = "nixpkgs"; | ||
| }; | ||
| devshell = { | ||
| url = "github:numtide/devshell"; | ||
| inputs.nixpkgs.follows = "nixpkgs"; | ||
| }; | ||
| }; | ||
|
|
||
| outputs = inputs: { | ||
| devShells = builtins.mapAttrs ( | ||
| system: pkgs': | ||
| let | ||
| pkgs = pkgs'.appendOverlays [ | ||
| (self: super: { | ||
| bundix = inputs.bundix; | ||
| }) | ||
| inputs.super.overlays.default | ||
| inputs.devshell.overlays.default | ||
| ]; | ||
| in | ||
| { | ||
| accentor-api = pkgs.callPackage ./shell.nix { }; | ||
| default = inputs.self.devShells.${system}.accentor-api; | ||
| deps = pkgs.devshell.mkShell { | ||
| packages = [ | ||
| pkgs.accentor-api.ruby | ||
| pkgs.bundix | ||
| ]; | ||
| }; | ||
| } | ||
| ) inputs.nixpkgs.legacyPackages; | ||
| }; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In an ideal world, this would follow the
nixpkgsofsuper, but that leads to issues with dependabot where the reference here isn't updated. Since dependabot does the updates anyway, they should remain in sync.