aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--default.nix10
-rw-r--r--nix/sources.json26
-rw-r--r--nix/sources.nix148
-rw-r--r--release.nix3
-rw-r--r--shell.nix27
6 files changed, 194 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore
index 6c80f28..eb64250 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ result
4 4
5# haskell 5# haskell
6dist-newstyle/ 6dist-newstyle/
7
8.direnv
diff --git a/default.nix b/default.nix
index 90576e7..e4f6be6 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,4 @@
1{ mkDerivation, base, mtl, parsec, QuickCheck, readline, stdenv 1{ mkDerivation, base, mtl, parsec, QuickCheck, readline, stdenv }:
2, test-framework, test-framework-hunit, test-framework-quickcheck2
3, test-framework-th
4}:
5mkDerivation { 2mkDerivation {
6 pname = "lisk"; 3 pname = "lisk";
7 version = "0.1.0.0"; 4 version = "0.1.0.0";
@@ -10,10 +7,7 @@ mkDerivation {
10 isExecutable = true; 7 isExecutable = true;
11 libraryHaskellDepends = [ base mtl parsec ]; 8 libraryHaskellDepends = [ base mtl parsec ];
12 executableHaskellDepends = [ base mtl parsec readline ]; 9 executableHaskellDepends = [ base mtl parsec readline ];
13 testHaskellDepends = [ 10 testHaskellDepends = [ base parsec QuickCheck ];
14 base parsec QuickCheck test-framework test-framework-hunit
15 test-framework-quickcheck2 test-framework-th
16 ];
17 description = "a lisp interpreter"; 11 description = "a lisp interpreter";
18 license = stdenv.lib.licenses.gpl3; 12 license = stdenv.lib.licenses.gpl3;
19} 13}
diff --git a/nix/sources.json b/nix/sources.json
new file mode 100644
index 0000000..6d5eda2
--- /dev/null
+++ b/nix/sources.json
@@ -0,0 +1,26 @@
1{
2 "niv": {
3 "branch": "master",
4 "description": "Easy dependency management for Nix projects",
5 "homepage": "https://github.com/nmattia/niv",
6 "owner": "nmattia",
7 "repo": "niv",
8 "rev": "9d35b9e4837ab88517210b1701127612c260eccf",
9 "sha256": "0q50xhnm8g2yfyakrh0nly4swyygxpi0a8cb9gp65wcakcgvzvdh",
10 "type": "tarball",
11 "url": "https://github.com/nmattia/niv/archive/9d35b9e4837ab88517210b1701127612c260eccf.tar.gz",
12 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
13 },
14 "nixpkgs": {
15 "branch": "nixos-20.03",
16 "description": "Nix Packages collection",
17 "homepage": "",
18 "owner": "NixOS",
19 "repo": "nixpkgs",
20 "rev": "d74573d8ae6f02ef0ac1299c862d1b762ba0aad1",
21 "sha256": "008xyc2yzaw8m1ikjq04fsp1rhcfn2a7zn445kwqqngb5vs7w8b6",
22 "type": "tarball",
23 "url": "https://github.com/NixOS/nixpkgs/archive/d74573d8ae6f02ef0ac1299c862d1b762ba0aad1.tar.gz",
24 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
25 }
26}
diff --git a/nix/sources.nix b/nix/sources.nix
new file mode 100644
index 0000000..b64b8f8
--- /dev/null
+++ b/nix/sources.nix
@@ -0,0 +1,148 @@
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: name: spec:
16 let
17 ok = str: ! builtins.isNull (builtins.match "[a-zA-Z0-9+-._?=]" str);
18 # sanitize the name, though nix will still fail if name starts with period
19 name' = stringAsChars (x: if ! ok x then "-" else x) "${name}-src";
20 in
21 if spec.builtin or true then
22 builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
23 else
24 pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
25
26 fetch_git = spec:
27 builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
28
29 fetch_local = spec: spec.path;
30
31 fetch_builtin-tarball = name: throw
32 ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
33 $ niv modify ${name} -a type=tarball -a builtin=true'';
34
35 fetch_builtin-url = name: throw
36 ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
37 $ niv modify ${name} -a type=file -a builtin=true'';
38
39 #
40 # Various helpers
41 #
42
43 # The set of packages used when specs are fetched using non-builtins.
44 mkPkgs = sources:
45 let
46 sourcesNixpkgs =
47 import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
48 hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
49 hasThisAsNixpkgsPath = <nixpkgs> == ./.;
50 in
51 if builtins.hasAttr "nixpkgs" sources
52 then sourcesNixpkgs
53 else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
54 import <nixpkgs> {}
55 else
56 abort
57 ''
58 Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
59 add a package called "nixpkgs" to your sources.json.
60 '';
61
62 # The actual fetching function.
63 fetch = pkgs: name: spec:
64
65 if ! builtins.hasAttr "type" spec then
66 abort "ERROR: niv spec ${name} does not have a 'type' attribute"
67 else if spec.type == "file" then fetch_file pkgs spec
68 else if spec.type == "tarball" then fetch_tarball pkgs name spec
69 else if spec.type == "git" then fetch_git spec
70 else if spec.type == "local" then fetch_local spec
71 else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
72 else if spec.type == "builtin-url" then fetch_builtin-url name
73 else
74 abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
75
76 # If the environment variable NIV_OVERRIDE_${name} is set, then use
77 # the path directly as opposed to the fetched source.
78 replace = name: drv:
79 let
80 saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
81 ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
82 in
83 if ersatz == "" then drv else ersatz;
84
85 # Ports of functions for older nix versions
86
87 # a Nix version of mapAttrs if the built-in doesn't exist
88 mapAttrs = builtins.mapAttrs or (
89 f: set: with builtins;
90 listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
91 );
92
93 # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
94 range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
95
96 # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
97 stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
98
99 # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
100 stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
101 concatStrings = builtins.concatStringsSep "";
102
103 # fetchTarball version that is compatible between all the versions of Nix
104 builtins_fetchTarball = { url, name, sha256 }@attrs:
105 let
106 inherit (builtins) lessThan nixVersion fetchTarball;
107 in
108 if lessThan nixVersion "1.12" then
109 fetchTarball { inherit name url; }
110 else
111 fetchTarball attrs;
112
113 # fetchurl version that is compatible between all the versions of Nix
114 builtins_fetchurl = { url, sha256 }@attrs:
115 let
116 inherit (builtins) lessThan nixVersion fetchurl;
117 in
118 if lessThan nixVersion "1.12" then
119 fetchurl { inherit url; }
120 else
121 fetchurl attrs;
122
123 # Create the final "sources" from the config
124 mkSources = config:
125 mapAttrs (
126 name: spec:
127 if builtins.hasAttr "outPath" spec
128 then abort
129 "The values in sources.json should not have an 'outPath' attribute"
130 else
131 spec // { outPath = replace name (fetch config.pkgs name spec); }
132 ) config.sources;
133
134 # The "config" used by the fetchers
135 mkConfig =
136 { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
137 , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
138 , pkgs ? mkPkgs sources
139 }: rec {
140 # The sources, i.e. the attribute set of spec name to spec
141 inherit sources;
142
143 # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
144 inherit pkgs;
145 };
146
147in
148mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
diff --git a/release.nix b/release.nix
index 8180314..75d5a3d 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,5 @@
1let 1let
2 pkgs = import <nixpkgs> {}; 2 sources = import ./nix/sources.nix {};
3 pkgs = import sources.nixpkgs {};
3in 4in
4 pkgs.haskellPackages.callPackage ./default.nix {} 5 pkgs.haskellPackages.callPackage ./default.nix {}
diff --git a/shell.nix b/shell.nix
index b1a597f..15334f5 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,19 +1,21 @@
1let 1let
2 sources = import ./nix/sources.nix;
3 pkgs = import sources.nixpkgs {};
2 4
3 all-hies = fetchTarball { 5 inherit (pkgs) haskellPackages;
4 url = "https://github.com/infinisil/all-hies/tarball/534ac517b386821b787d1edbd855b9966d0c0775"; 6 all-hls = pkgs.fetchFromGitHub {
5 sha256 = "0bw1llpwxbh1dnrnbxkj2l0j58s523hjivszf827c3az5i4py1i2"; 7 owner = "masaeedu";
8 repo = "all-hls";
9 rev = "155e57d7ca9f79ce293360f98895e9bd68d12355";
10 sha256 = "04s3mrxjdr7gmd901l1z23qglqmn8i39v7sdf2fv4zbv6hz24ydb";
6 }; 11 };
7 12
8 pkgs = import <nixpkgs> { 13 hls = import all-hls {
9 # Pass no config for purity 14 platform = "Linux";
10 config = {}; 15 version = "0.4.0";
11 overlays = [ 16 ghc = "8.6.5";
12 (import all-hies {}).overlay 17 }; # All parameters are optional. The default values are shown here.
13 ];
14 };
15 18
16 inherit (pkgs) haskellPackages;
17 19
18 haskellDeps = ps: with ps; [ 20 haskellDeps = ps: with ps; [
19 base 21 base
@@ -30,11 +32,10 @@ let
30 pkgs.gdb 32 pkgs.gdb
31 pkgs.cabal2nix 33 pkgs.cabal2nix
32 haskellPackages.cabal-install 34 haskellPackages.cabal-install
33 haskellPackages.hie
34 haskellPackages.hoogle 35 haskellPackages.hoogle
35 ]; 36 ];
36in 37in
37pkgs.stdenv.mkDerivation { 38pkgs.stdenv.mkDerivation {
38 name = "env"; 39 name = "env";
39 buildInputs = externalPackages; 40 buildInputs = externalPackages ++ [ hls ];
40} 41}