From 4f029cfd5952614ea0f8f76eaafa03b8b106a1d6 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Sun, 16 Jul 2023 14:26:31 +0200 Subject: [PATCH] Get flakes to work --- .gitignore | 6 +++++- flake.lock | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.gitignore b/.gitignore index 09deb601..3616a7b3 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,8 @@ dist-ssr .env.dev src/data/instances-full.json phanpy-dist.zip -phanpy-dist.tar.gz \ No newline at end of file +phanpy-dist.tar.gz + +# Nix +.direnv +result diff --git a/flake.lock b/flake.lock new file mode 100644 index 00000000..f55aa96e --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "owner": "nixOS", + "repo": "nixpkgs", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "type": "github" + }, + "original": { + "owner": "nixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 00000000..574adea2 --- /dev/null +++ b/flake.nix @@ -0,0 +1,62 @@ +{ + inputs.nixpkgs.url = github:nixOS/nixpkgs/nixos-unstable; + inputs.flake-utils.url = github:numtide/flake-utils; + + outputs = { self, nixpkgs, flake-utils, ... }: flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { inherit system; }; + lib = pkgs.lib; + + esbuild = pkgs.buildGoModule rec { + pname = "esbuild"; + version = "0.19.5"; + + src = pkgs.fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-mIXsPj804jxDd8+jPH8tWnnUj7dXIRwfKTeT4WDWb5c="; + }; + + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + + subPackages = [ "cmd/esbuild" ]; + + ldflags = [ "-s" "-w" ]; + + meta.mainProgram = "esbuild"; + }; + in + rec { + packages.default = pkgs.buildNpmPackage { + pname = "dtth-phanpy"; + version = "0.1.0"; + + nativeBuildInputs = with pkgs; [ git ]; + ESBUILD_BINARY_PATH = lib.getExe esbuild; + + src = lib.cleanSource ./.; + + npmFlags = [ "--legacy-peer-deps" ]; + npmDepsHash = "sha256-OkVF70K5xneFRTJiu1qCRIGvWgKWwhHMwCC+elMcVXo="; + # npmDepsHash = lib.fakeHash; + + # DTTH-specific env variables + PHANPY_CLIENT_NAME = "DTTH Phanpy"; + PHANPY_CLIENT_ID = "ch.dtth.phanpy"; + PHANPY_WEBSITE = "https://social.dtth.ch"; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib + cp -r dist $out/lib/phanpy + runHook postInstall + ''; + }; + + devShells.default = pkgs.mkShell { + inputsFrom = [ packages.default ]; + buildInputs = with pkgs; [ nodejs ]; + }; + }); +}