From 03e150fc2605aa46b54ed69cfc9a3feb02475f5b Mon Sep 17 00:00:00 2001 From: "Emma [it/its]@Rory&" Date: Fri, 28 Jun 2024 12:13:17 +0200 Subject: [PATCH] Add meta section to nix package, fix nix update script writing to wrong variable in hashes.json --- flake.lock | Bin 1497 -> 1497 bytes flake.nix | 12 +++++++++++- hashes.json | 2 +- nix-update.sh | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index ae5e8b23070de1f0618864a223c9a3c17f752ca5..77bf2b8620a5f7d1a37dc5bb4b8c1c26c3c997b4 100644 GIT binary patch delta 254 zcmcb~eUp1a2Zy17p^2G+vBAU%vf9B>raoq=j^-X-`gyt8RqpQQ`kukbIfbca`B5qU zQ6YZ$sl}O|dD#&Gfs^O6h);ZPp^;>mVwsp^ZeV6+WNBiSnr2{OYLH@LVUdz(m~3fa zXqjf5XlZV0lsNeSqw-`PX3dH34JV&rjNve}G%_`@FgFER>*}1BsqL9v9+6dA>`|O+ z8Jt>?Qc`G9p6XbrUm03iVi*$cnVK6>V(gs{v{rJmIkUjz^^9zj^O%M8i&D#!tQ3@t yEG&)FOwCeK4J-_d43pE+QY@3qlFU-llFbc(?BwJWQ^V9GGXsz_HuEr_WdZ;vC{N-5 delta 254 zcmcb~eUp1a2Zw>Fv4N$LvB|^k2LW`W7;8QCW1F$?P#rIsmKDJYp* ym>DMCnp&vTNr?xv6+YYEE52THBEy6 diff --git a/flake.nix b/flake.nix index 00a18f64..cc624004 100644 --- a/flake.nix +++ b/flake.nix @@ -13,11 +13,21 @@ inherit system; }; hashesFile = builtins.fromJSON (builtins.readFile ./hashes.json); + lib = pkgs.lib; in rec { packages.default = pkgs.buildNpmPackage { pname = "spacebar-server-ts"; - src = ./.; name = "spacebar-server-ts"; + + meta = with lib; { + description = "Spacebar server, a FOSS reimplementation of the Discord backend."; + homepage = "https://github.com/spacebarchat/server"; + license = licenses.agpl3Plus; + platforms = platforms.all; + mainProgram = "start-bundle"; + }; + + src = ./.; nativeBuildInputs = with pkgs; [ python3 ]; npmDepsHash = hashesFile.npmDepsHash; makeCacheWritable = true; diff --git a/hashes.json b/hashes.json index dd55b81d..bc319094 100644 --- a/hashes.json +++ b/hashes.json @@ -1,3 +1,3 @@ { - "npmDepsHash": "sha256-fZNDN2/fNy6Nu7tbr0RhQ8j4BP7X1Yhrh/fSTH7hbJc=" + "npmDepsHash": "sha256-RxGkjCU9qqqDMjhJ5aEq1w7c7lS4nAp0/3F0zASJQms=" } diff --git a/nix-update.sh b/nix-update.sh index 4413e6e0..a676e294 100755 --- a/nix-update.sh +++ b/nix-update.sh @@ -3,8 +3,8 @@ nix flake update DEPS_HASH=`prefetch-npm-deps package-lock.json` TMPFILE=$(mktemp) -jq '.npm_deps_hash = "'$DEPS_HASH'"' hashes.json > $TMPFILE +jq '.npmDepsHash = "'$DEPS_HASH'"' hashes.json > $TMPFILE mv -- "$TMPFILE" hashes.json nom build .# || exit $? -git add hashes.json flake.lock flake.nix \ No newline at end of file +git add hashes.json flake.lock flake.nix