aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--default.nix6
-rw-r--r--nix/sources.json38
-rw-r--r--nix/sources.nix134
-rw-r--r--shell.nix10
-rw-r--r--src/error.rs (renamed from src/error/mod.rs)0
-rw-r--r--src/format.rs (renamed from src/format/mod.rs)0
-rw-r--r--src/lex.rs (renamed from src/lex/mod.rs)3
-rw-r--r--src/main.rs3
-rw-r--r--src/parse.rs (renamed from src/parse/mod.rs)0
-rw-r--r--src/readline.rs (renamed from src/readline/mod.rs)0
11 files changed, 193 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 6c22375..fd72c00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@
8# ignore history used by rustyline 8# ignore history used by rustyline
9history.txt 9history.txt
10./.idea 10./.idea
11
12.envrc
13result
diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..a755ba1
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,6 @@
1let
2 pkgs = import <nixpkgs> {};
3 sources = import ./nix/sources.nix;
4 naersk = pkgs.callPackage sources.naersk {};
5in
6 naersk.buildPackage ./.
diff --git a/nix/sources.json b/nix/sources.json
new file mode 100644
index 0000000..17be642
--- /dev/null
+++ b/nix/sources.json
@@ -0,0 +1,38 @@
1{
2 "naersk": {
3 "branch": "master",
4 "description": "Build rust crates in Nix. No configuration, no code generation, no IFD. Sandbox friendly.",
5 "homepage": "",
6 "owner": "nmattia",
7 "repo": "naersk",
8 "rev": "22b96210b2433228d42bce460f3befbdcfde7520",
9 "sha256": "0qa8jnw71qk1i1fgpydx1nv17cnvlydb9jhd6f7gvhglagm19b4v",
10 "type": "tarball",
11 "url": "https://github.com/nmattia/naersk/archive/22b96210b2433228d42bce460f3befbdcfde7520.tar.gz",
12 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
13 },
14 "niv": {
15 "branch": "master",
16 "description": "Easy dependency management for Nix projects",
17 "homepage": "https://github.com/nmattia/niv",
18 "owner": "nmattia",
19 "repo": "niv",
20 "rev": "9d35b9e4837ab88517210b1701127612c260eccf",
21 "sha256": "0q50xhnm8g2yfyakrh0nly4swyygxpi0a8cb9gp65wcakcgvzvdh",
22 "type": "tarball",
23 "url": "https://github.com/nmattia/niv/archive/9d35b9e4837ab88517210b1701127612c260eccf.tar.gz",
24 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
25 },
26 "nixpkgs": {
27 "branch": "nixos-19.09",
28 "description": "DEPRECATED! This is an obsolete, read-only mirror of the NixOS/nixpkgs repository.",
29 "homepage": "https://github.com/NixOS/nixpkgs",
30 "owner": "NixOS",
31 "repo": "nixpkgs-channels",
32 "rev": "75f4ba05c63be3f147bcc2f7bd4ba1f029cedcb1",
33 "sha256": "157c64220lf825ll4c0cxsdwg7cxqdx4z559fdp7kpz0g6p8fhhr",
34 "type": "tarball",
35 "url": "https://github.com/NixOS/nixpkgs-channels/archive/75f4ba05c63be3f147bcc2f7bd4ba1f029cedcb1.tar.gz",
36 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
37 }
38}
diff --git a/nix/sources.nix b/nix/sources.nix
new file mode 100644
index 0000000..8a725cb
--- /dev/null
+++ b/nix/sources.nix
@@ -0,0 +1,134 @@
1# This file has been generated by Niv.
2
3let
4
5 #
6 # The fetchers. fetch_<type> fetches specs of type <type>.
7 #
8
9 fetch_file = pkgs: spec:
10 if spec.builtin or true then
11 builtins_fetchurl { inherit (spec) url sha256; }
12 else
13 pkgs.fetchurl { inherit (spec) url sha256; };
14
15 fetch_tarball = pkgs: spec:
16 if spec.builtin or true then
17 builtins_fetchTarball { inherit (spec) url sha256; }
18 else
19 pkgs.fetchzip { inherit (spec) url sha256; };
20
21 fetch_git = spec:
22 builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
23
24 fetch_builtin-tarball = spec:
25 builtins.trace
26 ''
27 WARNING:
28 The niv type "builtin-tarball" will soon be deprecated. You should
29 instead use `builtin = true`.
30
31 $ niv modify <package> -a type=tarball -a builtin=true
32 ''
33 builtins_fetchTarball { inherit (spec) url sha256; };
34
35 fetch_builtin-url = spec:
36 builtins.trace
37 ''
38 WARNING:
39 The niv type "builtin-url" will soon be deprecated. You should
40 instead use `builtin = true`.
41
42 $ niv modify <package> -a type=file -a builtin=true
43 ''
44 (builtins_fetchurl { inherit (spec) url sha256; });
45
46 #
47 # Various helpers
48 #
49
50 # The set of packages used when specs are fetched using non-builtins.
51 mkPkgs = sources:
52 let
53 sourcesNixpkgs =
54 import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
55 hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
56 hasThisAsNixpkgsPath = <nixpkgs> == ./.;
57 in
58 if builtins.hasAttr "nixpkgs" sources
59 then sourcesNixpkgs
60 else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
61 import <nixpkgs> {}
62 else
63 abort
64 ''
65 Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
66 add a package called "nixpkgs" to your sources.json.
67 '';
68
69 # The actual fetching function.
70 fetch = pkgs: name: spec:
71
72 if ! builtins.hasAttr "type" spec then
73 abort "ERROR: niv spec ${name} does not have a 'type' attribute"
74 else if spec.type == "file" then fetch_file pkgs spec
75 else if spec.type == "tarball" then fetch_tarball pkgs spec
76 else if spec.type == "git" then fetch_git spec
77 else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec
78 else if spec.type == "builtin-url" then fetch_builtin-url spec
79 else
80 abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
81
82 # Ports of functions for older nix versions
83
84 # a Nix version of mapAttrs if the built-in doesn't exist
85 mapAttrs = builtins.mapAttrs or (
86 f: set: with builtins;
87 listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
88 );
89
90 # fetchTarball version that is compatible between all the versions of Nix
91 builtins_fetchTarball = { url, sha256 }@attrs:
92 let
93 inherit (builtins) lessThan nixVersion fetchTarball;
94 in
95 if lessThan nixVersion "1.12" then
96 fetchTarball { inherit url; }
97 else
98 fetchTarball attrs;
99
100 # fetchurl version that is compatible between all the versions of Nix
101 builtins_fetchurl = { url, sha256 }@attrs:
102 let
103 inherit (builtins) lessThan nixVersion fetchurl;
104 in
105 if lessThan nixVersion "1.12" then
106 fetchurl { inherit url; }
107 else
108 fetchurl attrs;
109
110 # Create the final "sources" from the config
111 mkSources = config:
112 mapAttrs (
113 name: spec:
114 if builtins.hasAttr "outPath" spec
115 then abort
116 "The values in sources.json should not have an 'outPath' attribute"
117 else
118 spec // { outPath = fetch config.pkgs name spec; }
119 ) config.sources;
120
121 # The "config" used by the fetchers
122 mkConfig =
123 { sourcesFile ? ./sources.json
124 , sources ? builtins.fromJSON (builtins.readFile sourcesFile)
125 , pkgs ? mkPkgs sources
126 }: rec {
127 # The sources, i.e. the attribute set of spec name to spec
128 inherit sources;
129
130 # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
131 inherit pkgs;
132 };
133in
134mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..c0e1bb0
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,10 @@
1{ pkgs ? import <nixpkgs> {} }:
2
3pkgs.mkShell {
4 buildInputs = with pkgs; [
5 cargo
6 rustc
7 rustfmt
8 pkg-config
9 ];
10}
diff --git a/src/error/mod.rs b/src/error.rs
index ec2b555..ec2b555 100644
--- a/src/error/mod.rs
+++ b/src/error.rs
diff --git a/src/format/mod.rs b/src/format.rs
index 45673d7..45673d7 100644
--- a/src/format/mod.rs
+++ b/src/format.rs
diff --git a/src/lex/mod.rs b/src/lex.rs
index 3222c12..a2de98a 100644
--- a/src/lex/mod.rs
+++ b/src/lex.rs
@@ -5,9 +5,8 @@
5use lazy_static::lazy_static; 5use lazy_static::lazy_static;
6use std::collections::HashMap; 6use std::collections::HashMap;
7 7
8use crate::CONFIGURATION;
9
10use crate::error::{CalcError, Math}; 8use crate::error::{CalcError, Math};
9use crate::CONFIGURATION;
11 10
12#[derive(Debug, Copy, Clone, PartialEq)] 11#[derive(Debug, Copy, Clone, PartialEq)]
13pub struct Operator { 12pub struct Operator {
diff --git a/src/main.rs b/src/main.rs
index bc22ce2..5540da9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -192,8 +192,7 @@ fn parse_arguments() -> Configuration {
192} 192}
193 193
194pub fn eval_math_expression(input: &str, prev_ans: Option<f64>) -> Result<f64, CalcError> { 194pub fn eval_math_expression(input: &str, prev_ans: Option<f64>) -> Result<f64, CalcError> {
195 let input = input.trim(); 195 let input = input.trim().replace(" ", "");
196 let input = input.replace(" ", "");
197 if input.is_empty() { 196 if input.is_empty() {
198 return Ok(0.); 197 return Ok(0.);
199 } 198 }
diff --git a/src/parse/mod.rs b/src/parse.rs
index aa8bd4b..aa8bd4b 100644
--- a/src/parse/mod.rs
+++ b/src/parse.rs
diff --git a/src/readline/mod.rs b/src/readline.rs
index ea195ee..ea195ee 100644
--- a/src/readline/mod.rs
+++ b/src/readline.rs