Merge branch 'TechEmpower:master' into master

Author: robaho

frameworks/CSharp/aspnetcore/benchmark_config.json

@@ -1,5 +1,6 @@
 {
   "framework": "aspnetcore",
+  "maintainers": ["DamianEdwards", "sebastienros"],
   "tests": [
     {
       "default": {
@@ -14,15 +15,15 @@
         "approach": "Realistic",
         "classification": "Platform",
         "database": "Postgres",
-        "framework": "ASP.NET Core",
+        "framework": "ASP.NET Core [Platform]",
         "language": "C#",
         "orm": "Raw",
         "platform": ".NET",
         "flavor": "CoreCLR",
         "webserver": "Kestrel",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "ASP.NET Core [Platform, Pg]",
+        "display_name": "ASP.NET Core [Platform]",
         "notes": ""
       },
       "aot": {
@@ -37,15 +38,15 @@
         "approach": "Realistic",
         "classification": "Platform",
         "database": "Postgres",
-        "framework": "ASP.NET Core",
+        "framework": "ASP.NET Core [Platform]",
         "language": "C#",
         "orm": "Raw",
         "platform": ".NET",
         "flavor": "NativeAOT",
         "webserver": "Kestrel",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "ASP.NET Core [Platform, Pg, AOT]",
+        "display_name": "ASP.NET Core [Platform, AOT]",
         "notes": ""
       },
       "minimal": {
@@ -67,7 +68,7 @@
         "webserver": "Kestrel",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "ASP.NET Core [Minimal APIs, Pg, Dapper]",
+        "display_name": "ASP.NET Core [Minimal APIs]",
         "notes": "",
         "versus": "aspnetcore"
       },
@@ -89,7 +90,7 @@
         "webserver": "Kestrel",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "ASP.NET Core [MVC, Pg, EF]",
+        "display_name": "ASP.NET Core [MVC]",
         "notes": "",
         "versus": "aspnetcore"
       },
@@ -103,16 +104,17 @@
         "approach": "Realistic",
         "classification": "Platform",
         "database": "MySQL",
-        "framework": "ASP.NET Core",
+        "framework": "ASP.NET Core [Platform]",
         "language": "C#",
         "orm": "Raw",
         "platform": ".NET",
         "flavor": "CoreCLR",
         "webserver": "Kestrel",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "ASP.NET Core [Platform, My]",
-        "notes": ""
+        "display_name": "ASP.NET Core [Platform, MySQL]",
+        "notes": "",
+        "versus": "aspnetcore"
       }
     }
   ]

frameworks/Haskell/ihp/ihp.dockerfile

@@ -1,14 +1,14 @@
 FROM nixos/nix
 
-COPY ./src /ihp
-WORKDIR /ihp
-
 # Add build dependencies
-RUN nix-env -i cachix
+RUN nix-env -f https://github.com/NixOS/nixpkgs/archive/54b4bb956f9891b872904abdb632cea85a033ff2.tar.gz -iA cachix
 RUN cachix use digitallyinduced
 
+COPY ./src /ihp
+WORKDIR /ihp
+
 # Build 
-RUN nix-build -j auto --cores 0
+RUN nix --extra-experimental-features "nix-command flakes" build -j auto --cores 0 .#optimized-prod-server
 
 # Setup
 ENV DATABASE_URL=postgres://benchmarkdbuser:benchmarkdbpass@tfb-database:5432/hello_world

frameworks/Haskell/ihp/src/.envrc

@@ -0,0 +1,16 @@
+if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
+fi
+
+use flake . --impure --accept-flake-config
+
+# Include .env file if it exists locally. Use the .env file to load env vars that you don't want to commit to git
+if [ -f .env ]
+then
+    set -o allexport
+    source .env
+    set +o allexport
+fi
+# Add your env vars here
+#
+# E.g. export AWS_ACCESS_KEY_ID="XXXXX"

frameworks/Haskell/ihp/src/.ghci

@@ -1,3 +1,4 @@
-import Prelude
-:def source readFile
-:source build/ihp-lib/applicationGhciConfig
+:set -XNoImplicitPrelude
+:def loadFromIHP \file -> (System.Environment.getEnv "IHP_LIB") >>= (\ihpLib -> readFile (ihpLib <> "/" <> file))
+:loadFromIHP applicationGhciConfig
+import IHP.Prelude

frameworks/Haskell/ihp/src/.gitignore

@@ -1,5 +1,4 @@
 .DS_Store
-.envrc
 .idea
 tmp
 result
@@ -17,3 +16,8 @@ gen
 del
 static/prod.*
 Config/client_session_key.aes
+
+.devenv*
+devenv.local.nix
+.direnv
+.env

frameworks/Haskell/ihp/src/Makefile

@@ -1,11 +1,3 @@
-ifneq ($(wildcard IHP/.*),)
-IHP = IHP/lib/IHP
-else
-IHP = $(shell dirname $$(which RunDevServer))/../lib/IHP
-endif
-
-include ${IHP}/Makefile.dist
-
 CSS_FILES += ${IHP}/static/vendor/bootstrap.min.css
 CSS_FILES += ${IHP}/static/vendor/flatpickr.min.css
 
@@ -19,3 +11,5 @@ JS_FILES += ${IHP}/static/vendor/morphdom-umd.min.js
 JS_FILES += ${IHP}/static/vendor/turbolinks.js
 JS_FILES += ${IHP}/static/vendor/turbolinksInstantClick.js
 JS_FILES += ${IHP}/static/vendor/turbolinksMorphdom.js
+
+include ${IHP}/Makefile.dist