From a558f8ed3ccd9e7ebcfabc6fe50589a172fd8e47 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Wed, 24 Jan 2024 14:58:18 -0600 Subject: [PATCH] build: use typst stable, not typst from master --- flake.lock | 111 +---------------------------------------------------- flake.nix | 5 +-- 2 files changed, 3 insertions(+), 113 deletions(-) diff --git a/flake.lock b/flake.lock index d729d87..0257058 100644 --- a/flake.lock +++ b/flake.lock @@ -1,43 +1,5 @@ { "nodes": { - "crane": { - "inputs": { - "nixpkgs": [ - "typst", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698166613, - "narHash": "sha256-y4rdN4flxRiROqNi1waMYIZj/Fs7L2OrszFk/1ry9vU=", - "owner": "ipetkov", - "repo": "crane", - "rev": "b7db46f0f1751f7b1d1911f6be7daf568ad5bc65", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -72,45 +34,10 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "typst": "typst" + "nixpkgs": "nixpkgs" } }, "systems": { @@ -127,42 +54,6 @@ "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" - } - }, - "typst": { - "inputs": { - "crane": "crane", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2", - "systems": "systems_2" - }, - "locked": { - "lastModified": 1705584441, - "narHash": "sha256-xTat1Xc46hSLy7rkNnSnqgnB4YVvG6EkL6vpsWHcUv0=", - "owner": "typst", - "repo": "typst", - "rev": "f27321b269e8e258cdb1322ed399c22711bbfaa8", - "type": "github" - }, - "original": { - "owner": "typst", - "repo": "typst", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4640922..af21cef 100644 --- a/flake.nix +++ b/flake.nix @@ -2,18 +2,17 @@ description = "Price Hiller's Resume"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - typst.url = "github:typst/typst"; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, typst, flake-utils }: + outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in rec { packages.default = pkgs.stdenvNoCC.mkDerivation { name = "priceh-resume"; src = self; - buildInputs = [ typst.packages.${system}.typst-dev ]; + buildInputs = [ pkgs.typst ]; buildPhase = '' ls -alh typst compile ./resume.typ