diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-28 15:45:03 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-03-28 15:45:03 +0200 |
commit | 1a0821766baeb793d36dff0099810aeb0e202c00 (patch) | |
tree | 0141c0415f457fa42cb5f31be2319c6c68aa5b73 | |
parent | d28c483bdba02cf4163e99efcb07f2ee525ddda1 (diff) | |
download | bar-1a0821766baeb793d36dff0099810aeb0e202c00.tar bar-1a0821766baeb793d36dff0099810aeb0e202c00.tar.gz bar-1a0821766baeb793d36dff0099810aeb0e202c00.tar.bz2 bar-1a0821766baeb793d36dff0099810aeb0e202c00.tar.xz bar-1a0821766baeb793d36dff0099810aeb0e202c00.zip |
Low items don't count against shopping list
-rw-r--r-- | Handler/List.hs | 3 | ||||
-rw-r--r-- | bar.cabal | 2 | ||||
-rw-r--r-- | bar.nix | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Handler/List.hs b/Handler/List.hs index 7ab4ebe..8f9e777 100644 --- a/Handler/List.hs +++ b/Handler/List.hs | |||
@@ -28,7 +28,8 @@ list = runDB $ do | |||
28 | let | 28 | let |
29 | references' = Set.filter (isNothing . flip find items . matches) references | 29 | references' = Set.filter (isNothing . flip find items . matches) references |
30 | matches (Reference{..} `WithType` _) Item{..} | 30 | matches (Reference{..} `WithType` _) Item{..} |
31 | | today `isBefore` itemExpires = itemNormKind == referenceNormKind | 31 | | today `isBefore` itemExpires |
32 | , not $ itemRunningLow = itemNormKind == referenceNormKind | ||
32 | | otherwise = False | 33 | | otherwise = False |
33 | 34 | ||
34 | isBefore _ DateNever = True | 35 | isBefore _ DateNever = True |
@@ -1,5 +1,5 @@ | |||
1 | name: bar | 1 | name: bar |
2 | version: 0.4.0 | 2 | version: 0.4.1 |
3 | cabal-version: >= 1.8 | 3 | cabal-version: >= 1.8 |
4 | build-type: Simple | 4 | build-type: Simple |
5 | 5 | ||
@@ -10,7 +10,7 @@ | |||
10 | }: | 10 | }: |
11 | mkDerivation { | 11 | mkDerivation { |
12 | pname = "bar"; | 12 | pname = "bar"; |
13 | version = "0.4.0"; | 13 | version = "0.4.1"; |
14 | src = ./.; | 14 | src = ./.; |
15 | isLibrary = true; | 15 | isLibrary = true; |
16 | isExecutable = true; | 16 | isExecutable = true; |