Skip to content

Commit

Permalink
use flake compat stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
BrianHicks committed Jun 12, 2023
1 parent 206d878 commit d9690aa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 39 deletions.
13 changes: 3 additions & 10 deletions default.nix
@@ -1,10 +1,3 @@
{ sources ? import ./nix/sources.nix { }, pkgs ? import sources.nixpkgs { }, ...
}:
let
naersk = pkgs.callPackage sources.naersk { };
gitignore = pkgs.callPackage sources.gitignore { };
in naersk.buildPackage {
root = (gitignore.gitignoreSource ./.);
buildInputs = [ pkgs.libiconv ];
}

(import (fetchTarball https://github.com/edolstra/flake-compat/archive/master.tar.gz) {
src = builtins.fetchGit ./.;
}).defaultNix
32 changes: 3 additions & 29 deletions shell.nix
@@ -1,29 +1,3 @@
{ ... }:
let
sources = import ./nix/sources.nix;
nixpkgs = import sources.nixpkgs { };
niv = import sources.niv { };
naersk = nixpkgs.callPackage sources.naersk { };

cargo-lichking = naersk.buildPackage sources.cargo-lichking;
in with nixpkgs;
stdenv.mkDerivation {
name = "elm-forbid-import";
buildInputs = [
niv.niv
git

# Rust
cargo
cargo-lichking
rustPackages.clippy
rustPackages.rustfmt
rustc

# Benchmarking + Optimization
hyperfine

# Testing
jq
];
}
(import (fetchTarball https://github.com/edolstra/flake-compat/archive/master.tar.gz) {
src = builtins.fetchGit ./.;
}).shellNix

0 comments on commit d9690aa

Please sign in to comment.