From e1a5f7d3ccb34fb2ec1f1ae47b831d3a1104b5be Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Sat, 14 Dec 2024 07:06:46 -0500 Subject: [PATCH] feat: add sheetsui snapshot --- nix/base-system/flake.lock | 126 ++++++++++++++++++++++++++++++++++++- nix/base-system/flake.nix | 4 ++ 2 files changed, 128 insertions(+), 2 deletions(-) diff --git a/nix/base-system/flake.lock b/nix/base-system/flake.lock index dbe1d28..12d2ba2 100644 --- a/nix/base-system/flake.lock +++ b/nix/base-system/flake.lock @@ -325,6 +325,24 @@ "inputs": { "systems": "systems_11" }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_14": { + "inputs": { + "systems": "systems_12" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -719,6 +737,24 @@ "type": "github" } }, + "naersk_6": { + "inputs": { + "nixpkgs": "nixpkgs_15" + }, + "locked": { + "lastModified": 1721727458, + "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", + "owner": "nix-community", + "repo": "naersk", + "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, "neogit-src": { "flake": false, "locked": { @@ -924,6 +960,34 @@ } }, "nixpkgs_15": { + "locked": { + "lastModified": 1729658218, + "narHash": "sha256-9Rg+AqLqvqqJniP/OQB3GtgXoAd8IlazsHp97va042Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dfffb2e7a52d29a0ef8e21ec8a0f30487b227f1a", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_16": { + "locked": { + "lastModified": 1729658218, + "narHash": "sha256-9Rg+AqLqvqqJniP/OQB3GtgXoAd8IlazsHp97va042Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dfffb2e7a52d29a0ef8e21ec8a0f30487b227f1a", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_17": { "locked": { "lastModified": 1682109806, "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", @@ -1111,6 +1175,7 @@ "roslyn-lsp": "roslyn-lsp_2", "runwhen-flake": "runwhen-flake", "rust-overlay-flake": "rust-overlay-flake", + "sheetsui-flake": "sheetsui-flake", "sile-flake": "sile-flake", "treesitter-context": "treesitter-context_2", "unstable": "unstable" @@ -1327,13 +1392,55 @@ "type": "github" } }, + "rust-overlay_7": { + "inputs": { + "nixpkgs": [ + "sheetsui-flake", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729650555, + "narHash": "sha256-j8Sohst1TbQM6LqQKa/HRMfzsUwMhosuNMj2uOn9JOA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "10c5eb61aaa32caddb9ecf0362a6eb9daeb08eab", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "sheetsui-flake": { + "inputs": { + "flake-utils": "flake-utils_13", + "naersk": "naersk_6", + "nixpkgs": "nixpkgs_16", + "rust-overlay": "rust-overlay_7" + }, + "locked": { + "lastModified": 1733525038, + "narHash": "sha256-4ECXJND/pbQlTeqZEQOVUcoqC0d6PfAKNGMWavwYXGA=", + "owner": "zaphar", + "repo": "sheetsui", + "rev": "ffc5df157b90fd087ddea98e307178c6f4142dfc", + "type": "github" + }, + "original": { + "owner": "zaphar", + "repo": "sheetsui", + "type": "github" + } + }, "sile-flake": { "inputs": { "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_13", + "flake-utils": "flake-utils_14", "gitignore": "gitignore", "libtexpdf-src": "libtexpdf-src", - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_17" }, "locked": { "lastModified": 1694595810, @@ -1394,6 +1501,21 @@ "type": "github" } }, + "systems_12": { + "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, diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix index 5046bd0..99b9190 100644 --- a/nix/base-system/flake.nix +++ b/nix/base-system/flake.nix @@ -13,6 +13,7 @@ # ensure that darwinSystem uses our nixpkgs version inputs.nixpkgs.follows = "nixpkgs-darwin"; }; + sheetsui-flake.url = "github:zaphar/sheetsui"; sile-flake.url = "github:sile-typesetter/sile"; durnitisp-flake.url = "github:zaphar/durnitisp"; runwhen-flake.url = "github:zaphar/runwhen"; @@ -80,6 +81,7 @@ heracles-flake, neovim-flake, clio-flake, + sheetsui-flake, ... # We don't use the self or nixpkgs args here so we just glob it. }: rec { @@ -236,6 +238,7 @@ EOF"; nurl = nurl-flake.packages."${system}".default; clio = clio-flake.packages."${system}".default; unstablePkgs = import unstable { inherit system; }; + sheetsui = sheetsui-flake.packages."${system}".default; #lean4Pkg = lean4-flake.defaultPackage."${system}"; in { config, pkgs, ... }: { @@ -289,6 +292,7 @@ EOF"; }; environment.systemPackages = (with pkgs; [ isabelle + sheetsui lean4 quint quint-lsp