pin nixpkgs to 20.03, fix broken readline dep

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
 
 # haskell
 dist-newstyle/
+
+.direnv
diff --git a/default.nix b/default.nix
index 90576e7..e4f6be6 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,4 @@
-{ mkDerivation, base, mtl, parsec, QuickCheck, readline, stdenv
-, test-framework, test-framework-hunit, test-framework-quickcheck2
-, test-framework-th
-}:
+{ mkDerivation, base, mtl, parsec, QuickCheck, readline, stdenv }:
 mkDerivation {
   pname = "lisk";
   version = "0.1.0.0";
@@ -10,10 +7,7 @@ mkDerivation {
   isExecutable = true;
   libraryHaskellDepends = [ base mtl parsec ];
   executableHaskellDepends = [ base mtl parsec readline ];
-  testHaskellDepends = [
-    base parsec QuickCheck test-framework test-framework-hunit
-    test-framework-quickcheck2 test-framework-th
-  ];
+  testHaskellDepends = [ base parsec QuickCheck ];
   description = "a lisp interpreter";
   license = stdenv.lib.licenses.gpl3;
 }
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 @@
+{
+    "niv": {
+        "branch": "master",
+        "description": "Easy dependency management for Nix projects",
+        "homepage": "https://github.com/nmattia/niv",
+        "owner": "nmattia",
+        "repo": "niv",
+        "rev": "9d35b9e4837ab88517210b1701127612c260eccf",
+        "sha256": "0q50xhnm8g2yfyakrh0nly4swyygxpi0a8cb9gp65wcakcgvzvdh",
+        "type": "tarball",
+        "url": "https://github.com/nmattia/niv/archive/9d35b9e4837ab88517210b1701127612c260eccf.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nixpkgs": {
+        "branch": "nixos-20.03",
+        "description": "Nix Packages collection",
+        "homepage": "",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d74573d8ae6f02ef0ac1299c862d1b762ba0aad1",
+        "sha256": "008xyc2yzaw8m1ikjq04fsp1rhcfn2a7zn445kwqqngb5vs7w8b6",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/d74573d8ae6f02ef0ac1299c862d1b762ba0aad1.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    }
+}
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 @@
+# This file has been generated by Niv.
+
+let
+
+  #
+  # The fetchers. fetch_<type> fetches specs of type <type>.
+  #
+
+  fetch_file = pkgs: spec:
+    if spec.builtin or true then
+      builtins_fetchurl { inherit (spec) url sha256; }
+    else
+      pkgs.fetchurl { inherit (spec) url sha256; };
+
+  fetch_tarball = pkgs: name: spec:
+    let
+      ok = str: ! builtins.isNull (builtins.match "[a-zA-Z0-9+-._?=]" str);
+      # sanitize the name, though nix will still fail if name starts with period
+      name' = stringAsChars (x: if ! ok x then "-" else x) "${name}-src";
+    in
+      if spec.builtin or true then
+        builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
+      else
+        pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
+
+  fetch_git = spec:
+    builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
+
+  fetch_local = spec: spec.path;
+
+  fetch_builtin-tarball = name: throw
+    ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
+        $ niv modify ${name} -a type=tarball -a builtin=true'';
+
+  fetch_builtin-url = name: throw
+    ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
+        $ niv modify ${name} -a type=file -a builtin=true'';
+
+  #
+  # Various helpers
+  #
+
+  # The set of packages used when specs are fetched using non-builtins.
+  mkPkgs = sources:
+    let
+      sourcesNixpkgs =
+        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
+      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
+      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
+    in
+      if builtins.hasAttr "nixpkgs" sources
+      then sourcesNixpkgs
+      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
+        import <nixpkgs> {}
+      else
+        abort
+          ''
+            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+            add a package called "nixpkgs" to your sources.json.
+          '';
+
+  # The actual fetching function.
+  fetch = pkgs: name: spec:
+
+    if ! builtins.hasAttr "type" spec then
+      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
+    else if spec.type == "file" then fetch_file pkgs spec
+    else if spec.type == "tarball" then fetch_tarball pkgs name spec
+    else if spec.type == "git" then fetch_git spec
+    else if spec.type == "local" then fetch_local spec
+    else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
+    else if spec.type == "builtin-url" then fetch_builtin-url name
+    else
+      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
+
+  # If the environment variable NIV_OVERRIDE_${name} is set, then use
+  # the path directly as opposed to the fetched source.
+  replace = name: drv:
+    let
+      saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
+      ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
+    in
+      if ersatz == "" then drv else ersatz;
+
+  # Ports of functions for older nix versions
+
+  # a Nix version of mapAttrs if the built-in doesn't exist
+  mapAttrs = builtins.mapAttrs or (
+    f: set: with builtins;
+    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
+  );
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
+  range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
+  stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
+  stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
+  concatStrings = builtins.concatStringsSep "";
+
+  # fetchTarball version that is compatible between all the versions of Nix
+  builtins_fetchTarball = { url, name, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchTarball;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchTarball { inherit name url; }
+      else
+        fetchTarball attrs;
+
+  # fetchurl version that is compatible between all the versions of Nix
+  builtins_fetchurl = { url, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchurl;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchurl { inherit url; }
+      else
+        fetchurl attrs;
+
+  # Create the final "sources" from the config
+  mkSources = config:
+    mapAttrs (
+      name: spec:
+        if builtins.hasAttr "outPath" spec
+        then abort
+          "The values in sources.json should not have an 'outPath' attribute"
+        else
+          spec // { outPath = replace name (fetch config.pkgs name spec); }
+    ) config.sources;
+
+  # The "config" used by the fetchers
+  mkConfig =
+    { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
+    , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
+    , pkgs ? mkPkgs sources
+    }: rec {
+      # The sources, i.e. the attribute set of spec name to spec
+      inherit sources;
+
+      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
+      inherit pkgs;
+    };
+
+in
+mkSources (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 @@
 let 
-  pkgs = import <nixpkgs> {};
+  sources = import ./nix/sources.nix {};
+  pkgs = import sources.nixpkgs {};
 in
   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 @@
 let
+  sources = import ./nix/sources.nix;
+  pkgs = import sources.nixpkgs {};
 
-  all-hies = fetchTarball {
-    url = "https://github.com/infinisil/all-hies/tarball/534ac517b386821b787d1edbd855b9966d0c0775";
-    sha256 = "0bw1llpwxbh1dnrnbxkj2l0j58s523hjivszf827c3az5i4py1i2";
+  inherit (pkgs) haskellPackages;
+  all-hls = pkgs.fetchFromGitHub {
+    owner = "masaeedu";
+    repo = "all-hls";
+    rev = "155e57d7ca9f79ce293360f98895e9bd68d12355";
+    sha256 = "04s3mrxjdr7gmd901l1z23qglqmn8i39v7sdf2fv4zbv6hz24ydb";
   };
 
-  pkgs = import <nixpkgs> {
-    # Pass no config for purity
-    config = {};
-    overlays = [
-      (import all-hies {}).overlay
-    ];
-  };
+  hls = import all-hls {
+    platform = "Linux";
+    version = "0.4.0";
+    ghc = "8.6.5";
+  }; # All parameters are optional. The default values are shown here.
 
-  inherit (pkgs) haskellPackages;
 
   haskellDeps = ps: with ps; [
     base
@@ -30,11 +32,10 @@ let
     pkgs.gdb
     pkgs.cabal2nix
     haskellPackages.cabal-install
-    haskellPackages.hie
     haskellPackages.hoogle
   ];
 in
 pkgs.stdenv.mkDerivation {
   name = "env";
-  buildInputs = externalPackages;
+  buildInputs = externalPackages ++ [ hls ];
 }