aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris2016-10-05 09:59:43 +0200
committerJoris2016-10-05 09:59:43 +0200
commite899cecde7fb10b5e7ae1b6130922437297f5cb0 (patch)
tree1b97a323296ad78d77640fdcdde36f044f60d9a8
parent75804df1cb231033f94183e41cdf79d36d8f6710 (diff)
Add the build command
-rw-r--r--README.md14
-rwxr-xr-xbuild2
-rw-r--r--default.nix (renamed from build.nix)3
-rwxr-xr-xdev2
-rw-r--r--package.json3
-rw-r--r--shell.nix18
6 files changed, 17 insertions, 25 deletions
diff --git a/README.md b/README.md
index e7d9cfe..d1544aa 100644
--- a/README.md
+++ b/README.md
@@ -12,13 +12,13 @@ Install nix:
curl https://nixos.org/nix/install | sh
```
-Inside the project directory, open a nix shell:
+Then:
```
-nix-shell
+./dev
```
-Inside tmux, add some users with sqlite after the migration is done:
+Inside the tmux session, add some users with sqlite after the migration is done:
```
sqlite3 database
@@ -26,6 +26,13 @@ insert into user(creation, email, name) values (datetime('now'), 'john@mail.com'
insert into user(creation, email, name) values (datetime('now'), 'lisa@mail.com', 'Lisa');
```
+Simple build
+------------
+
+```
+./build
+```
+
Configuration
-------------
@@ -35,5 +42,4 @@ TODO
----
- CRUD animation (loading, created-updated-deleted element)
-- Dates after today must be forbidden
- Weekly notifications about added, modified, deleted payments and incomes
diff --git a/build b/build
new file mode 100755
index 0000000..38bfe40
--- /dev/null
+++ b/build
@@ -0,0 +1,2 @@
+#!/bin-sh
+nix-shell --command "make clean install build"
diff --git a/build.nix b/default.nix
index 66e7e04..3db9b27 100644
--- a/build.nix
+++ b/default.nix
@@ -1,13 +1,14 @@
with import <nixpkgs> {}; {
env = stdenv.mkDerivation {
name = "env";
- buildInputs = [
+ buildInputs = with pkgs; [
elmPackages.elm
cabal-install
cabal2nix
nodejs
sqlite
tmux
+ tmuxinator
];
};
}
diff --git a/dev b/dev
new file mode 100755
index 0000000..ddd2ada
--- /dev/null
+++ b/dev
@@ -0,0 +1,2 @@
+#!/bin/sh
+nix-shell --command "tmuxinator local"
diff --git a/package.json b/package.json
index 56b0d09..6d7467e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,6 @@
{
"dependencies": {
- "nodemon": "1.9.2",
- "elm": "0.17.1"
+ "nodemon": "1.9.2"
},
"repository": "guyonvarch/sharedCost",
"license": "GPL-3.0"
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index 04290b8..0000000
--- a/shell.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-with import <nixpkgs> {}; {
- env = stdenv.mkDerivation {
- name = "env";
- buildInputs = [
- elmPackages.elm
- cabal-install
- cabal2nix
- nodejs
- sqlite
- tmux
- tmuxinator
- ];
- shellHook = ''
- tmux kill-session -t sharedCost >/dev/null 2>&1
- tmuxinator local
- '';
- };
-}