aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Jankowski <daniel.jankowski@rub.de>2023-09-09 20:25:30 +0200
committerDaniel Jankowski <daniel.jankowski@rub.de>2023-09-09 20:25:30 +0200
commit50aa00b56db54a6312b528ef26c269633bba2efd (patch)
treea11dab4808d1bac717d7a311357ad27a5de067d9
parentchore: update crates (diff)
downloadsl0pstatus-50aa00b56db54a6312b528ef26c269633bba2efd.tar.gz
sl0pstatus-50aa00b56db54a6312b528ef26c269633bba2efd.tar.xz
sl0pstatus-50aa00b56db54a6312b528ef26c269633bba2efd.zip
feat: add flake for building zjstatus
-rw-r--r--.envrc2
-rw-r--r--flake.lock183
-rw-r--r--flake.nix82
3 files changed, 266 insertions, 1 deletions
diff --git a/.envrc b/.envrc
index 1d953f4..3550a30 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1 @@
-use nix
+use flake
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..21fe26a
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,183 @@
+{
+ "nodes": {
+ "crane": {
+ "inputs": {
+ "flake-compat": "flake-compat",
+ "flake-utils": "flake-utils",
+ "nixpkgs": [
+ "nixpkgs"
+ ],
+ "rust-overlay": "rust-overlay"
+ },
+ "locked": {
+ "lastModified": 1693787605,
+ "narHash": "sha256-rwq5U8dy+a9JFny/73L0SJu1GfWwATMPMTp7D+mjHy8=",
+ "owner": "ipetkov",
+ "repo": "crane",
+ "rev": "8b4f7a4dab2120cf41e7957a28a853f45016bd9d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "ipetkov",
+ "repo": "crane",
+ "type": "github"
+ }
+ },
+ "flake-compat": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1673956053,
+ "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "flake-utils": {
+ "inputs": {
+ "systems": "systems"
+ },
+ "locked": {
+ "lastModified": 1692799911,
+ "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_2": {
+ "inputs": {
+ "systems": "systems_2"
+ },
+ "locked": {
+ "lastModified": 1692799911,
+ "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "nixpkgs": {
+ "locked": {
+ "lastModified": 1694062546,
+ "narHash": "sha256-PiGI4f2BGnZcedP6slLjCLGLRLXPa9+ogGGgVPfGxys=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "b200e0df08f80c32974a6108ce431d8a8a5e6547",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "root": {
+ "inputs": {
+ "crane": "crane",
+ "flake-utils": "flake-utils_2",
+ "nixpkgs": "nixpkgs",
+ "rust-overlay": "rust-overlay_2"
+ }
+ },
+ "rust-overlay": {
+ "inputs": {
+ "flake-utils": [
+ "crane",
+ "flake-utils"
+ ],
+ "nixpkgs": [
+ "crane",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1693707092,
+ "narHash": "sha256-HR1EnynBSPqbt+04/yxxqsG1E3n6uXrOl7SPco/UnYo=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "98ccb73e6eefc481da6039ee57ad8818d1ca8d56",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
+ },
+ "rust-overlay_2": {
+ "inputs": {
+ "flake-utils": [
+ "flake-utils"
+ ],
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1694225334,
+ "narHash": "sha256-f3uOfcfmG53biFl6zHPHSFrBucLGQp0LpRYQJlozZSA=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "1b4fad9dccece45c25b9ebda607427d69a8f1eae",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
+ },
+ "systems": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
+ "systems_2": {
+ "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..10a9780
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,82 @@
+{
+ description = "A configurable and themable statusbar for zellij.";
+
+ inputs = {
+ nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+
+ crane = {
+ url = "github:ipetkov/crane";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+
+ flake-utils.url = "github:numtide/flake-utils";
+
+ rust-overlay = {
+ url = "github:oxalica/rust-overlay";
+ inputs = {
+ nixpkgs.follows = "nixpkgs";
+ flake-utils.follows = "flake-utils";
+ };
+ };
+ };
+
+ outputs = { self, nixpkgs, crane, flake-utils, rust-overlay, ... }:
+ flake-utils.lib.eachDefaultSystem (system:
+ let
+ pkgs = import nixpkgs {
+ inherit system;
+ overlays = [ (import rust-overlay) ];
+ };
+
+ rustWithWasiTarget = pkgs.rust-bin.stable.latest.default.override {
+ targets = [ "wasm32-wasi" ];
+ };
+
+ # NB: we don't need to overlay our custom toolchain for the *entire*
+ # pkgs (which would require rebuidling anything else which uses rust).
+ # Instead, we just want to update the scope that crane will use by appending
+ # our specific toolchain there.
+ craneLib = (crane.mkLib pkgs).overrideToolchain rustWithWasiTarget;
+
+ zjstatus = craneLib.buildPackage {
+ src = craneLib.cleanCargoSource (craneLib.path ./.);
+
+ cargoExtraArgs = "--target wasm32-wasi";
+
+ # Tests currently need to be run via `cargo wasi` which
+ # isn't packaged in nixpkgs yet...
+ doCheck = false;
+
+ buildInputs = [
+ # Add additional build inputs here
+ ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
+ # Additional darwin specific inputs can be set here
+ pkgs.libiconv
+ ];
+ };
+ in
+ {
+ checks = {
+ inherit zjstatus;
+ };
+
+ packages.default = zjstatus;
+
+ devShells.default = craneLib.devShell {
+ # Inherit inputs from checks.
+ checks = self.checks.${system};
+
+ # Extra inputs can be added here; cargo and rustc are provided by default
+ # from the toolchain that was specified earlier.
+ packages = with pkgs; [
+ # rustWithWasiTarget
+ cargo-audit
+ cargo-watch
+ cargo-wasi
+ clippy
+ rust-analyzer
+ wasmtime
+ ];
+ };
+ });
+}