Merge remote-tracking branch 'refs/remotes/origin/main'

Author: aspizu

default.nix

@@ -1,18 +1,21 @@
-{ lib, rustPlatform }:
+{ lib, rustPlatform, pkg-config, openssl, rust }:
 
 rustPlatform.buildRustPackage {
   pname = "goboscript";
-  version = "3.0.0";
+  version = "3.3.0";
 
   src = ./.;
 
   cargoLock = {
     lockFile = ./Cargo.lock;
   };
 
+  nativeBuildInputs = [ pkg-config rust ];
+  buildInputs = [ openssl ];
+
   meta = {
-    description = "Scratch compiler";
+    description = "goboscript is the Scratch compiler";
     homepage = "https://github.com/aspizu/goboscript";
     license = lib.licenses.mit;
   };
-}
+}

docs/install.md

@@ -38,3 +38,45 @@ To update:
 ```bash
 cargo +nightly install --git https://github.com/aspizu/goboscript --force
 ```
+
+## Install with nix
+
+!!! note
+
+    The nix flake installs goboscript from source, like the other methods, so you will need to be patient.
+
+### devShell
+
+You can test goboscript without installing it to your system with the nix devshell, a bit like `nix-shell -p {some package}`.
+This will create a subshell where `goboscript` is installed.
+Once you exit this subshell, you will no longer be able to use the `goboscript` command
+(until you open a new devShell or install it system-wide).
+Once you run `nix-collect-garbage`, the `goboscript` installation files will actually be removed from your system.
+
+Simply run the command `nix develop github:aspizu/goboscript`
+
+### Nixos standalone installation (flake)
+
+This is for if you want to have `goboscript` available system-wide.
+For nix flakes, add the input `goboscript` and add it to `environment.systemPackages` in your flake, roughly like so:
+
+```nix
+{
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs?ref=25.11";
+    goboscript.url = "github:aspizu/goboscript";
+  };
+  outputs = { self, nixpkgs, goboscript, ... }: {
+    nixosConfigurations.yourHostname = nixpkgs.lib.nixosSystem {
+      modules = [
+        ({ pkgs, ... }: {
+          environment.systemPackages = [
+            goboscript.packages.${pkgs.stdenv.hostPlatform.system}.goboscript
+          ];
+        })
+      ];
+    };
+  };
+}
+```
+

flake.lock

@@ -1,23 +1,33 @@
 {
-  description = "Scratch compiler";
+  description = "goboscript is the Scratch compiler";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
+    rust-overlay.url = "github:oxalica/rust-overlay";
   };
 
-  outputs = inputs@{ self, nixpkgs, flake-utils, ... }:
+  outputs = inputs@{ self, nixpkgs, flake-utils, rust-overlay, ... }:
   flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-darwin" ] (system: let
-    pkgs = nixpkgs.legacyPackages.${system};
+    overlays = [ (import rust-overlay) ];
+    pkgs = import nixpkgs {
+      inherit system overlays;
+    };
+    rust = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default);
   in rec {
-    packages.goboscript = pkgs.callPackage ./default.nix { };
+    packages.goboscript = pkgs.callPackage ./default.nix {
+      inherit (pkgs) pkg-config openssl;
+      inherit rust;
+    };
 
     legacyPackages = packages;
 
     defaultPackage = packages.goboscript;
 
     devShell = pkgs.mkShell {
-      buildInputs = with pkgs; [ cargo rustc git ];
+      buildInputs = with pkgs; [ git openssl pkg-config ];
+      packages = [ packages.goboscript ];
+      nativeBuildInputs = [ rust ];
     };
   });
 }