make compatible with newer Aeson and GHC

.envrc

@@ -0,0 +1,4 @@
+nix_direnv_watch_file memis.cabal
+nix_direnv_watch_file default.nix
+use nix
+

default.nix

@@ -1,8 +1,11 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc883" }:
-
-rec {
-  simple-templates = import ./simple-templates { inherit nixpkgs compiler; };
-  simple = import ./simple { inherit nixpkgs compiler simple-templates; };
-  simple-postgresql-orm = import ./simple-postgresql-orm { inherit nixpkgs compiler simple; };
-  simple-session = import ./simple-session { inherit nixpkgs compiler simple; };
-}
+# -*- compile-command: "nix-shell --run 'cabal exec -- ghc-pkg list'"; -*-
+{ pkgs ? import (import ./nix/sources.nix {}).nixpkgs {}, sources ? import ./nix/sources.nix {} }:
+  # https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/make-package-set.nix
+pkgs.haskellPackages.developPackage {
+    root = ./.;
+    withHoogle = false;
+    returnShellEnv = false;
+    modifier = with pkgs.haskell.lib; drv:
+      disableLibraryProfiling (dontHaddock (addBuildTools drv
+        (with pkgs.haskellPackages; [ cabal-install ghcid])));
+  }

shell.nix

@@ -0,0 +1,2 @@
+# -*- compile-command: "nix-shell --run 'cabal exec -- ghc-pkg list'"; -*-
+(import ./. {}).env

simple-templates/.direnv/nix-profile-pre466845.09ad6a72359

@@ -0,0 +1 @@
+/nix/store/44bk55whrvqawdly5bxb80pkxv4agsys-ghc-shell-for-simple-templates-1.0.0-env

simple-templates/.envrc

@@ -0,0 +1,4 @@
+nix_direnv_watch_file simple-templates.cabal
+nix_direnv_watch_file default.nix
+use nix
+

simple-templates/default.nix

@@ -1,2 +1,11 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc883" }:
-nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./simple-templates.nix { }
+# -*- compile-command: "nix-shell --run 'cabal exec -- ghc-pkg list'"; -*-
+{ pkgs ? import (import ./nix/sources.nix {}).nixpkgs {}, sources ? import ./nix/sources.nix {} }:
+  # https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/make-package-set.nix
+pkgs.haskellPackages.developPackage {
+    root = ./.;
+    withHoogle = false;
+    returnShellEnv = false;
+    modifier = with pkgs.haskell.lib; drv:
+      disableLibraryProfiling (dontHaddock (addBuildTools drv
+        (with pkgs.haskellPackages; [ cabal-install ghcid])));
+  }

simple-templates/nix/sources.json

@@ -0,0 +1,14 @@
+{
+    "nixpkgs": {
+        "branch": "nixos-unstable",
+        "description": "Nix Packages collection",
+        "homepage": null,
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2b54954fdb4a25c6f9cf80cfd36c43e4c4577c0b",
+        "sha256": "1sn4az6xc2ag23pnxhh8dbgxnk757d5d63spnv93bnls9k3d9vrg",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/2b54954fdb4a25c6f9cf80cfd36c43e4c4577c0b.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    }
+}

simple-templates/nix/sources.nix

@@ -0,0 +1,194 @@
+# This file has been generated by Niv.
+
+let
+
+  #
+  # The fetchers. fetch_<type> fetches specs of type <type>.
+  #
+
+  fetch_file = pkgs: name: spec:
+    let
+      name' = sanitizeName name + "-src";
+    in
+      if spec.builtin or true then
+        builtins_fetchurl { inherit (spec) url sha256; name = name'; }
+      else
+        pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
+
+  fetch_tarball = pkgs: name: spec:
+    let
+      name' = sanitizeName 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 = name: spec:
+    let
+      ref =
+        if spec ? ref then spec.ref else
+          if spec ? branch then "refs/heads/${spec.branch}" else
+            if spec ? tag then "refs/tags/${spec.tag}" else
+              abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
+      submodules = if spec ? submodules then spec.submodules else false;
+      submoduleArg =
+        let
+          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
+          emptyArgWithWarning =
+            if submodules == true
+            then
+              builtins.trace
+                (
+                  "The niv input \"${name}\" uses submodules "
+                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
+                  + "does not support them"
+                )
+                {}
+            else {};
+        in
+          if nixSupportsSubmodules
+          then { inherit submodules; }
+          else emptyArgWithWarning;
+    in
+      builtins.fetchGit
+        ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
+
+  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
+  #
+
+  # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
+  sanitizeName = name:
+    (
+      concatMapStrings (s: if builtins.isList s then "-" else s)
+        (
+          builtins.split "[^[:alnum:]+._?=-]+"
+            ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
+        )
+    );
+
+  # The set of packages used when specs are fetched using non-builtins.
+  mkPkgs = sources: system:
+    let
+      sourcesNixpkgs =
+        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
+      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 name spec
+    else if spec.type == "tarball" then fetch_tarball pkgs name spec
+    else if spec.type == "git" then fetch_git name 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
+        # this turns the string into an actual Nix path (for both absolute and
+        # relative paths)
+        if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${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));
+  concatMapStrings = f: list: concatStrings (map f list);
+  concatStrings = builtins.concatStringsSep "";
+
+  # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
+  optionalAttrs = cond: as: if cond then as else {};
+
+  # fetchTarball version that is compatible between all the versions of Nix
+  builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchTarball;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
+      else
+        fetchTarball attrs;
+
+  # fetchurl version that is compatible between all the versions of Nix
+  builtins_fetchurl = { url, name ? null, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchurl;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
+      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)
+    , system ? builtins.currentSystem
+    , pkgs ? mkPkgs sources system
+    }: 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); }

simple-templates/shell.nix

@@ -1,35 +1,2 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "default", doBenchmark ? false }:
-
-let
-
-  inherit (nixpkgs) pkgs;
-
-  f = { mkDerivation, aeson, attoparsec, base, hspec, HUnit
-      , scientific, stdenv, text, unordered-containers, vector
-      }:
-      mkDerivation {
-        pname = "simple-templates";
-        version = "0.9.0.0";
-        src = ./.;
-        libraryHaskellDepends = [
-          aeson attoparsec base scientific text unordered-containers vector
-        ];
-        testHaskellDepends = [
-          aeson attoparsec base hspec HUnit scientific vector
-        ];
-        homepage = "http://simple.cx";
-        description = "A basic template language for the Simple web framework";
-        license = stdenv.lib.licenses.lgpl3;
-      };
-
-  haskellPackages = if compiler == "default"
-                       then pkgs.haskellPackages
-                       else pkgs.haskell.packages.${compiler};
-
-  variant = if doBenchmark then pkgs.haskell.lib.doBenchmark else pkgs.lib.id;
-
-  drv = variant (haskellPackages.callPackage f {});
-
-in
-
-  if pkgs.lib.inNixShell then drv.env else drv
+# -*- compile-command: "nix-shell --run 'cabal exec -- ghc-pkg list'"; -*-
+(import ./. {}).env

simple-templates/src/Web/Simple/Templates/Language.hs

@@ -37,6 +37,8 @@ module Web.Simple.Templates.Language
 
 import qualified Data.HashMap.Strict as H
 import Data.Aeson
+import qualified Data.Aeson.Key as K
+import qualified Data.Aeson.KeyMap as K
 import Data.Maybe
 import Data.Scientific
 import Data.Text (Text)
@@ -68,13 +70,13 @@ evaluateAST fm global ast =
     ASTVar ident ->
       if ident == "@" then global else
         case global of
-          Object obj -> fromMaybe Null $ H.lookup ident obj
+          Object obj -> fromMaybe Null $ K.lookup (K.fromText ident) obj
           _ -> Null
 
     ASTIndex objAst idents ->
       foldl (\val ident -> 
         case val of
-          Object obj -> fromMaybe Null $ H.lookup ident obj
+          Object obj -> fromMaybe Null $ K.lookup (K.fromText ident) obj
           _ -> Null) (evaluateAST fm global objAst) idents
 
     ASTArray asts -> Array $ V.map (evaluateAST fm global) asts
@@ -98,7 +100,7 @@ astForLoop fm global mkeyName valName lst body msep =
     Bool False -> String ""
     Array vec ->
       String $ go (zip [0..(V.length vec)] $ V.toList vec) mempty
-    Object obj -> String $ go (H.toList obj) mempty
+    Object obj -> String $ go (K.toList obj) mempty
     v -> evaluateAST fm (replaceVar global valName v) body
   where sep = maybe (String "") (evaluateAST fm global) msep
         val = evaluateAST fm global lst
@@ -118,8 +120,8 @@ astForLoop fm global mkeyName valName lst body msep =
           maybe global (\k -> replaceVar global k $ toJSON v) mkeyName
 
 replaceVar :: Value -> Identifier -> Value -> Value
-replaceVar (Object orig) varName newVal = Object $ H.insert varName newVal orig
-replaceVar _ varName newVal = object [varName .= newVal]
+replaceVar (Object orig) varName newVal = Object $ K.insert (K.fromText varName) newVal orig
+replaceVar _ varName newVal = object [(K.fromText varName) .= newVal]
 
 evaluate :: AST -> Template
 evaluate ast = Template $ \fm global ->

simple/.direnv/nix-profile-pre466845.09ad6a72359

@@ -0,0 +1 @@
+/nix/store/s14yh6w688macmr5farwgyzp96cd1s8l-ghc-shell-for-simple-1.0.0-env