Skip to content

Commit

Permalink
switch to flake
Browse files Browse the repository at this point in the history
  • Loading branch information
sequencer committed Mar 22, 2023
1 parent dd10429 commit 137126d
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 72 deletions.
43 changes: 43 additions & 0 deletions flake.lock

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

30 changes: 30 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
description = "vector";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/master";
flake-utils.url = "github:numtide/flake-utils";
};

outputs = { self, nixpkgs, flake-utils }@inputs:
let
overlay = import ./overlay.nix;
in
flake-utils.lib.eachDefaultSystem
(system:
let
pkgs = import nixpkgs { inherit system; overlays = [ overlay ]; };
deps = with pkgs; [
mill
espresso
];
in
{
legacyPackages = pkgs;
devShell = pkgs.mkShell {
buildInputs = deps;
};
}
)
// { inherit inputs; overlays.default = overlay; };
}
13 changes: 13 additions & 0 deletions nix/espresso.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{ stdenv, fetchFromGitHub, cmake, ninja }:
stdenv.mkDerivation rec {
pname = "espresso";
version = "2.4";
nativeBuildInputs = [ cmake ninja ];
src = fetchFromGitHub {
owner = "chipsalliance";
repo = "espresso";
rev = "v${version}";
sha256 = "sha256-z5By57VbmIt4sgRgvECnLbZklnDDWUA6fyvWVyXUzsI=";
};
}

5 changes: 5 additions & 0 deletions overlay.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
final: prev:
{
mill = prev.mill.override { jre = final.openjdk19; };
espresso = final.callPackage ./nix/espresso.nix { };
}
72 changes: 0 additions & 72 deletions shell.nix

This file was deleted.

0 comments on commit 137126d

Please sign in to comment.