diff --git a/.posthtmlrc b/.posthtmlrc
index aa02b22..4730013 100644
--- a/.posthtmlrc
+++ b/.posthtmlrc
@@ -21,7 +21,7 @@
"dir": "auto",
"lang": "en-US",
"background": "#0f0f0f",
- "theme_color": "#991dce",
+ "theme_color": "#99d1ce",
"appleStatusBarStyle": "black-translucent",
"display": "browser",
"orientation": "any",
diff --git a/flake.lock b/flake.lock
index 74da35b..8ed6f75 100644
--- a/flake.lock
+++ b/flake.lock
@@ -31,10 +31,27 @@
"type": "github"
}
},
+ "nixpkgs-unstable": {
+ "locked": {
+ "lastModified": 1617899217,
+ "narHash": "sha256-gd5JHH7IkeoIQ/oiGZSqDpGdGt7DMRJTQ8JiD8+hdOQ=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
"flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs"
+ "nixpkgs": "nixpkgs",
+ "nixpkgs-unstable": "nixpkgs-unstable"
}
}
},
diff --git a/flake.nix b/flake.nix
index 6242681..c84255b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,12 +3,14 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-20.09";
+ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
};
- outputs = { self, nixpkgs, flake-utils }@inputs:
+ outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils }@inputs:
flake-utils.lib.simpleFlake {
- inherit self nixpkgs;
+ inherit self;
+ nixpkgs = nixpkgs-unstable;
name = "tlaternet-templates";
overlay = final: prev: {
@@ -42,15 +44,30 @@
devShell = prev.mkShell {
buildInputs = with prev;
- with nodePackages; [
+ with nodePackages;
+ [
nodejs
node2nix
- prettier
+ # Handy dev tools
+ prettier
typescript
typescript-language-server
- ];
+ ] ++ packages.nodeEnv.shell.buildInputs;
};
+
+ # TODO: This would be the ideal. Sadly, parcel isn't smart
+ # enough to pull its plugins from $NODE_PATH.
+ #
+ #
+ # devShell = packages.nodeEnv.shell.override {
+ # buildInputs = with prev; with nodePackages; [
+ # node2nix
+
+ # prettier
+ # typescript-language-server
+ # ];
+ # };
};
};
};
diff --git a/nix/default.nix b/nix/default.nix
index c970861..64326c6 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import {
inherit system;
@@ -6,12 +6,12 @@
let
nodeEnv = import ./node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
- inherit nodejs;
+ inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+ inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
- inherit (pkgs) fetchurl fetchgit;
+ inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/nix/node-env.nix b/nix/node-env.nix
index e1abf53..c2b7231 100644
--- a/nix/node-env.nix
+++ b/nix/node-env.nix
@@ -1,8 +1,11 @@
# This file originates from node2nix
-{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
let
+ # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
+ utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
+
python = if nodejs ? python then nodejs.python else python2;
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@@ -38,8 +41,8 @@ let
};
includeDependencies = {dependencies}:
- stdenv.lib.optionalString (dependencies != [])
- (stdenv.lib.concatMapStrings (dependency:
+ lib.optionalString (dependencies != [])
+ (lib.concatMapStrings (dependency:
''
# Bundle the dependencies of the package
mkdir -p node_modules
@@ -100,7 +103,7 @@ let
cd "$DIR/${packageName}"
${includeDependencies { inherit dependencies; }}
cd ..
- ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
'';
pinpointDependencies = {dependencies, production}:
@@ -161,12 +164,12 @@ let
''
node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
- ${stdenv.lib.optionalString (dependencies != [])
+ ${lib.optionalString (dependencies != [])
''
if [ -d node_modules ]
then
cd node_modules
- ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+ ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
cd ..
fi
''}
@@ -183,7 +186,7 @@ let
cd "${packageName}"
${pinpointDependencies { inherit dependencies production; }}
cd ..
- ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
fi
'';
@@ -242,8 +245,8 @@ let
if(fs.existsSync("./package-lock.json")) {
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
- if(packageLock.lockfileVersion !== 1) {
- process.stderr.write("Sorry, I only understand lock file version 1!\n");
+ if(![1, 2].includes(packageLock.lockfileVersion)) {
+ process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
process.exit(1);
}
@@ -344,8 +347,8 @@ let
cd "${packageName}"
runHook preRebuild
- ${stdenv.lib.optionalString bypassCache ''
- ${stdenv.lib.optionalString reconstructLock ''
+ ${lib.optionalString bypassCache ''
+ ${lib.optionalString reconstructLock ''
if [ -f package-lock.json ]
then
echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
@@ -361,14 +364,14 @@ let
node ${addIntegrityFieldsScript}
''}
- npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
if [ "''${dontNpmInstall-}" != "1" ]
then
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
rm -f npm-shrinkwrap.json
- npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
fi
'';
@@ -396,8 +399,8 @@ let
stdenv.mkDerivation ({
name = "node_${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
- ++ stdenv.lib.optional (stdenv.isLinux) utillinux
- ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+ ++ lib.optional (stdenv.isLinux) utillinux
+ ++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
inherit nodejs;
@@ -445,8 +448,8 @@ let
'';
} // extraArgs);
- # Builds a development shell
- buildNodeShell =
+ # Builds a node environment (a node_modules folder and a set of binaries)
+ buildNodeDependencies =
{ name
, packageName
, version
@@ -465,13 +468,13 @@ let
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-
- nodeDependencies = stdenv.mkDerivation ({
+ in
+ stdenv.mkDerivation ({
name = "node-dependencies-${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
- ++ stdenv.lib.optional (stdenv.isLinux) utillinux
- ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+ ++ lib.optional (stdenv.isLinux) utillinux
+ ++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
inherit dontStrip; # Stripping may fail a build for some package deployments
@@ -491,7 +494,7 @@ let
# Create fake package.json to make the npm commands work properly
cp ${src}/package.json .
chmod 644 package.json
- ${stdenv.lib.optionalString bypassCache ''
+ ${lib.optionalString bypassCache ''
if [ -f ${src}/package-lock.json ]
then
cp ${src}/package-lock.json .
@@ -500,23 +503,44 @@ let
# Go to the parent folder to make sure that all packages are pinpointed
cd ..
- ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
# Expose the executables that were installed
cd ..
- ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
mv ${packageName} lib
ln -s $out/lib/node_modules/.bin $out/bin
'';
} // extraArgs);
+
+ # Builds a development shell
+ buildNodeShell =
+ { name
+ , packageName
+ , version
+ , src
+ , dependencies ? []
+ , buildInputs ? []
+ , production ? true
+ , npmFlags ? ""
+ , dontNpmInstall ? false
+ , bypassCache ? false
+ , reconstructLock ? false
+ , dontStrip ? true
+ , unpackPhase ? "true"
+ , buildPhase ? "true"
+ , ... }@args:
+
+ let
+ nodeDependencies = buildNodeDependencies args;
in
stdenv.mkDerivation {
name = "node-shell-${name}-${version}";
- buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+ buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <