From 9f1a0e83e7cd9ab6bd90ff60894e67d6893a979e Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Sat, 22 Apr 2023 16:07:51 +0200 Subject: [PATCH] z: Add nix flake, seems broken --- flake.lock | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 33 +++++++++++++++++++++ pnpm-lock.yaml | 2 +- 3 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..bb1fcaf --- /dev/null +++ b/flake.lock @@ -0,0 +1,78 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1681932375, + "narHash": "sha256-tSXbYmpnKSSWpzOrs27ie8X3I0yqKA6AuCzCYNtwbCU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3d302c67ab8647327dba84fbdb443cdbf0e82744", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "pnpm2nix": { + "flake": false, + "locked": { + "lastModified": 1676829786, + "narHash": "sha256-ywnp/Y20Bv62Vs4v39NezJ4irSg6IJUR+J25hBMu+yA=", + "owner": "TheArcaneBrony", + "repo": "pnpm2nix", + "rev": "65e000773abd988f1f0cb99ff592d7945e7dd349", + "type": "github" + }, + "original": { + "owner": "TheArcaneBrony", + "repo": "pnpm2nix", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "pnpm2nix": "pnpm2nix" + } + }, + "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 0000000..8b4f33f --- /dev/null +++ b/flake.nix @@ -0,0 +1,33 @@ +{ + description = "Spacebar client, written in React."; + + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; + inputs.flake-utils.url = "github:numtide/flake-utils"; + inputs.pnpm2nix.url = "github:TheArcaneBrony/pnpm2nix"; + #inputs.pnpm2nix.url = "path:/home/root@Rory/git/spacebar/client/pnpm2nix"; + inputs.pnpm2nix.flake = false; + + outputs = { self, nixpkgs, flake-utils, pnpm2nix }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + }; + _pnpm2nix = import pnpm2nix { pkgs = nixpkgs.legacyPackages.${system}; }; + in rec { + packages.default = _pnpm2nix.mkPnpmPackage { + src = ./.; + buildInputs = with pkgs; [ + + ]; + }; + devShell = pkgs.mkShell { + buildInputs = with pkgs; [ + nodejs + nodePackages.pnpm + nodePackages.typescript + ]; + }; + } + ); +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 261cb56..c325ced 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '6.0' +lockfileVersion: '5.4' dependencies: '@emotion/react':