Add forked bundix to the devshell

Just to make it easier to set up for next time.
This commit is contained in:
Gabriel Arazas 2023-11-17 22:02:56 +08:00
parent 887d2a675e
commit 83aad53d74
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
3 changed files with 45 additions and 10 deletions

27
flake.lock generated
View File

@ -38,7 +38,8 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"ruby-nix": "ruby-nix" "ruby-nix": "ruby-nix",
"ruby-nix-bundix": "ruby-nix-bundix"
} }
}, },
"ruby-nix": { "ruby-nix": {
@ -50,17 +51,37 @@
"locked": { "locked": {
"lastModified": 1688825976, "lastModified": 1688825976,
"narHash": "sha256-7EvZu+/+uNZ0kfSgQQIrRGg8RXcUN9UgRsobjbxEdBQ=", "narHash": "sha256-7EvZu+/+uNZ0kfSgQQIrRGg8RXcUN9UgRsobjbxEdBQ=",
"owner": "sagittaros", "owner": "inscapist",
"repo": "ruby-nix", "repo": "ruby-nix",
"rev": "911d5e8584453e1aff0fb85c93aa163dcdd0f3f0", "rev": "911d5e8584453e1aff0fb85c93aa163dcdd0f3f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "sagittaros", "owner": "inscapist",
"repo": "ruby-nix", "repo": "ruby-nix",
"type": "github" "type": "github"
} }
}, },
"ruby-nix-bundix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1688825865,
"narHash": "sha256-7HP6amLkY3u2NvPguanIW/gugUvGsmY5OMY6tKpjMrA=",
"owner": "inscapist",
"repo": "bundix",
"rev": "5cb01869cb09fb367c02527b1f66707fb9277076",
"type": "github"
},
"original": {
"owner": "inscapist",
"repo": "bundix",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

View File

@ -5,8 +5,11 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
ruby-nix.url = "github:sagittaros/ruby-nix"; ruby-nix.url = "github:inscapist/ruby-nix";
ruby-nix.inputs.nixpkgs.follows = "nixpkgs"; ruby-nix.inputs.nixpkgs.follows = "nixpkgs";
ruby-nix-bundix.url = "github:inscapist/bundix";
ruby-nix-bundix.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs@{ self, ruby-nix, nixpkgs, ... }: outputs = inputs@{ self, ruby-nix, nixpkgs, ... }:
@ -17,7 +20,12 @@
in in
{ {
devShells.default = devShells.default =
import ./shell.nix { inherit pkgs ruby-nix; }; import ./shell.nix {
inherit pkgs ruby-nix;
extraPackages = [
inputs.ruby-nix-bundix.packages."${system}".default
];
};
formatter = pkgs.treefmt; formatter = pkgs.treefmt;
}); });

View File

@ -1,4 +1,8 @@
{ pkgs ? import <nixpkgs> { }, ruby-nix }: { pkgs ? import <nixpkgs> { }
, ruby-nix
, extraPackages ? [ ]
, extraBuildInputs ? [ ]
}:
with pkgs; with pkgs;
@ -13,15 +17,17 @@ mkShell {
buildInputs = [ buildInputs = [
gems.env gems.env
gems.ruby gems.ruby
]; pkg-config
zlib
libiconv
libgit2
] ++ extraBuildInputs;
packages = [ packages = [
bundix
# Formatters # Formatters
nixpkgs-fmt nixpkgs-fmt
# Language servers # Language servers
rnix-lsp rnix-lsp
]; ] ++ extraPackages;
} }