Skip to content

Commit

Permalink
chore(nix): adds fzz nightly into shell (#176)
Browse files Browse the repository at this point in the history
* fix(linux): install script

* fix(linux): install script

* chore(nix): adds fzz nightly into shell

* chore(nix): update package names pattern pkg and pkgNightly
  • Loading branch information
cristianoliveira authored Jul 11, 2024
1 parent c5641ff commit 887a822
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/on-push-nixbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
github_access_token: ${{ secrets.GITHUB_TOKEN }}

- run: nix flake check
- run: nix build .#nightly --verbose
- run: make nix-build
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ nix-check:
@nix flake check

nix-build:
@nix build .#nightly
@nix build .#
@nix build .#ergoProxyNigthly
@nix build .#ergoProxy

nix-hash-reset:
@sed -i '' 's/sha256-.*=//g' nix/package.nix
36 changes: 35 additions & 1 deletion flake.lock

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

9 changes: 5 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs";
utils.url = "github:numtide/flake-utils";
conixpkgs.url = "github:cristianoliveira/nixpkgs";
};
outputs = { self, nixpkgs, utils }:
outputs = { self, nixpkgs, utils, conixpkgs }:
utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs {
Expand All @@ -13,8 +14,9 @@
overlays = [
(_: prev: {
copkgs = {
funzzy = conixpkgs.packages."${system}".funzzyNightly;
ergoProxy = pkgs.callPackage ./nix/package.nix { inherit pkgs; };
nightly = pkgs.callPackage ./nix/package-nightly.nix {
ergoProxyNigthly = pkgs.callPackage ./nix/package-nightly.nix {
inherit pkgs;
};
};
Expand All @@ -28,9 +30,8 @@
};

packages = {
default = pkgs.copkgs.ergoProxy;
ergoProxy = pkgs.copkgs.ergoProxy;
nightly = pkgs.copkgs.nightly;
ergoProxyNigthly = pkgs.copkgs.ergoProxyNigthly;
};
});
}
1 change: 1 addition & 0 deletions nix/dev-env.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
buildInputs = [
pkgs.go
pkgs.copkgs.ergoProxy
pkgs.copkgs.funzzy
];

shell = pkgs.zsh;
Expand Down

0 comments on commit 887a822

Please sign in to comment.