Skip to content

Commit

Permalink
chore(nix): Add devenv to nix and redo nix setup (#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
sekunho committed Apr 2, 2023
1 parent e8cfa03 commit 08de19a
Show file tree
Hide file tree
Showing 7 changed files with 289 additions and 57 deletions.
2 changes: 1 addition & 1 deletion .envrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
use flake
use flake . --impure
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ public/app.css
# flamegraph
perf.data*
flamegraph.svg

.devenv
213 changes: 202 additions & 11 deletions flake.lock

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

20 changes: 12 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
# Min nix version: 2.7.0
description = "A URL shortener, except emojis";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs";
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixospkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
devenv.url = "github:cachix/devenv";

naersk = {
url = "github:nix-community/naersk";
Expand All @@ -17,10 +17,9 @@
};
};

outputs = { self, nixpkgs, nixos-unstable, naersk, pre-commit-hooks }: (
outputs = { self, nixpkgs, nixospkgs, devenv, naersk, pre-commit-hooks } @ inputs: (
let system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
unstablepkgs = nixos-unstable.legacyPackages.${system};
pkgs = nixospkgs.legacyPackages.${system};

naersk-lib = naersk.lib.${system}.override {
cargo = pkgs.cargo;
Expand All @@ -29,12 +28,10 @@

shell = import ./nix/shell.nix {
inherit pkgs;
inherit unstablepkgs;
};

emojied = import ./nix/modules/packages/emojied.nix {
inherit pkgs;
inherit unstablepkgs;
inherit naersk-lib;
};

Expand Down Expand Up @@ -93,7 +90,14 @@
};

nixosModule = import ./nix/modules/services/emojied.nix;
devShells.${system}.default = shell;

devShells.${system}.default = devenv.lib.mkShell {
inherit inputs pkgs;

modules = [
./nix/shell.nix
];
};
}
);
}
10 changes: 5 additions & 5 deletions nix/modules/packages/emojied.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ pkgs, unstablepkgs, naersk-lib }:
{ pkgs, naersk-lib }:

(naersk-lib.buildPackage {
pname = "emojied";
version = "0.1.3";
version = "0.1.4";
root = ../../../.;
nativeBuildInputs = with pkgs; [ ];
buildInputs = with pkgs; [ openssl pkg-config ];
}).overrideAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [
unstablepkgs.nodePackages.typescript
unstablepkgs.nodePackages.tailwindcss
unstablepkgs.esbuild
pkgs.nodePackages.typescript
pkgs.nodePackages.tailwindcss
pkgs.esbuild
];

doCheck = true;
Expand Down
Loading

0 comments on commit 08de19a

Please sign in to comment.