Skip to content

Commit

Permalink
move to flakes
Browse files Browse the repository at this point in the history
  • Loading branch information
BrianHicks committed Sep 13, 2021
1 parent aff22eb commit 090cb5e
Show file tree
Hide file tree
Showing 5 changed files with 128 additions and 53 deletions.
27 changes: 0 additions & 27 deletions default.nix

This file was deleted.

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.

56 changes: 56 additions & 0 deletions flake.nix
@@ -0,0 +1,56 @@
{
inputs = {
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:NixOS/nixpkgs/release-21.05";
};

outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
let pkgs = nixpkgs.legacyPackages.${system};
in rec {
# `nix build`
packages.elo-anything = pkgs.stdenv.mkDerivation {
name = "elo-anything";
src = ./.;

buildInputs = [ pkgs.elmPackages.elm pkgs.elmPackages.elm-test ];
buildPhase = pkgs.elmPackages.fetchElmDeps {
elmPackages = import ./nix/elm-srcs.nix;
elmVersion = "0.19.1";
registryDat = ./nix/registry.dat;
};

doCheck = true;
checkPhase = ''
env ELM_HOME=.elm elm-test
'';

installPhase = ''
make dist
mkdir -p $out/share/
mv dist $out/share/elo-anything
'';
};
defaultPackage = packages.elo-anything;
overlay = final: prev: { elo-anything = packages.elo-anything; };

# `nix shell`
devShell = pkgs.mkShell {
buildInputs = with pkgs; [
git

# Elm
elmPackages.elm
elmPackages.elm-format
elmPackages.elm-json
elmPackages.elm-test
elm2nix

# Build Stuff
gnumake
modd
devd
];
};
});
}
29 changes: 3 additions & 26 deletions shell.nix
@@ -1,26 +1,3 @@
{ ... }:
let
sources = import ./nix/sources.nix;

nixpkgs = import sources.nixpkgs { };

niv = import sources.niv { };
in with nixpkgs;
mkShell {
buildInputs = [
niv.niv
git

# Elm
elmPackages.elm
elmPackages.elm-format
elmPackages.elm-json
elmPackages.elm-test
elm2nix

# Build Stuff
gnumake
modd
devd
];
}
(import (fetchTarball https://github.com/edolstra/flake-compat/archive/master.tar.gz) {
src = builtins.fetchGit ./.;
}).shellNix
26 changes: 26 additions & 0 deletions shell.nix.bak
@@ -0,0 +1,26 @@
{ ... }:
let
sources = import ./nix/sources.nix;

nixpkgs = import sources.nixpkgs { };

niv = import sources.niv { };
in with nixpkgs;
mkShell {
buildInputs = [
niv.niv
git

# Elm
elmPackages.elm
elmPackages.elm-format
elmPackages.elm-json
elmPackages.elm-test
elm2nix

# Build Stuff
gnumake
modd
devd
];
}

0 comments on commit 090cb5e

Please sign in to comment.