zaphar/dotfiles
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Update sile to proper nix flake

Browse Source
This commit is contained in:
Jeremy Wall 2023-06-12 21:43:00 -04:00
parent 90578d1476
commit 2ed648dfcf
2 changed files with 131 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
nix/darwin/flake.lock generated
View File

@ -113,6 +113,22 @@
"type": "github"
}
},
"flake-compat_3": {
"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": {
"locked": {
"lastModified": 1644229661,
@ -173,6 +189,45 @@
"type": "github"
}
},
"flake-utils_5": {
"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"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"sile-flake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1660459072,
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"jj": {
"inputs": {
"nixpkgs": "nixpkgs_3"
@ -191,6 +246,22 @@
"type": "github"
}
},
"libtexpdf-src": {
"flake": false,
"locked": {
"lastModified": 1662109873,
"narHash": "sha256-yThIb+D/m1xeJZESojRd3u4OugbWl7f2s8oJohspwZs=",
"owner": "sile-typesetter",
"repo": "libtexpdf",
"rev": "736a5e7530c13582ea704a061a358d0caa774916",
"type": "github"
},
"original": {
"owner": "sile-typesetter",
"repo": "libtexpdf",
"type": "github"
}
},
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs_2"
@ -243,22 +314,6 @@
"type": "github"
}
},
"nixpkgs-lua": {
"locked": {
"lastModified": 1677676435,
"narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1645937171,
@ -332,6 +387,22 @@
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1682109806,
"narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2362848adf8def2866fabbffc50462e929d7fffb",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"agenix": "agenix",
@ -339,9 +410,9 @@
"durnitisp": "durnitisp",
"jj": "jj",
"nixpkgs": "nixpkgs_4",
"nixpkgs-lua": "nixpkgs-lua",
"runwhen": "runwhen",
"rust-overlay": "rust-overlay_2"
"rust-overlay": "rust-overlay_2",
"sile-flake": "sile-flake"
}
},
"runwhen": {
@ -393,7 +464,7 @@
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixpkgs-lua"
"nixpkgs"
]
},
"locked": {
@ -409,6 +480,43 @@
"repo": "rust-overlay",
"type": "github"
}
},
"sile-flake": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_5",
"gitignore": "gitignore",
"libtexpdf-src": "libtexpdf-src",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1685738177,
"narHash": "sha256-FbLjS7LvgvwZ84F7x79J8YIbqA/VI5+4XOqoonDqzDU=",
"owner": "sile-typesetter",
"repo": "sile",
"rev": "c7320e450ff0319b920fef29af0eb59d79f2fbc5",
"type": "github"
},
"original": {
"owner": "sile-typesetter",
"repo": "sile",
"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"
}
}
},
"root": "root",

14
nix/darwin/flake.nix
View File

@ -1,38 +1,34 @@
{
inputs = {
# NOTE(jwall): Pinning this to a fixed version of lua on darwin for now.
nixpkgs-lua.url = "github:nixos/nixpkgs?rev=a08d6979dd7c82c4cef0dcc6ac45ab16051c1169";
nixpkgs.url = "github:nixos/nixpkgs/release-23.05";
darwin.url = "github:lnl7/nix-darwin";
darwin.inputs.nixpkgs.follows = "nixpkgs";
sile-flake.url = "github:sile-typesetter/sile";
runwhen.url = "github:zaphar/runwhen?ref=v0.0.5";
#nil.url = "github:oxalica/nil/2023-05-09";
durnitisp.url = "github:zaphar/durnitisp";
agenix.url = "github:ryantm/agenix";
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs-lua";
inputs.nixpkgs.follows = "nixpkgs";
};
jj.url = "github:martinvonz/jj";
};
outputs = {self,
nixpkgs,
nixpkgs-lua,
sile-flake,
darwin,
runwhen,
durnitisp,
rust-overlay,
jj,
agenix,
#nil,
}:
let
forSystem = (system:
let
pkgs = import nixpkgs { inherit system; };
pkgs-lua = import nixpkgs-lua { inherit system; };
in
darwin.lib.darwinSystem rec {
inherit system;
@ -44,11 +40,9 @@
runwhen = runwhen.defaultPackage."${system}";
durnitisp = durnitisp.defaultPackage."${system}";
rust-overlay = rust-overlay.overlay;
#TODO(jwall): when the libtexpdf issue is fixed we can stop doing this
sile = pkgs-lua.sile.overrideAttrs(oldAttrs: { doCheck = false; meta.broken = false; });
sile = sile-flake.defaultPackage.${system};
jj = jj.defaultPackage."${system}";
age = agenix.packages."${system}".default;
#nil = nil.packages."${system}".default;
};
});
in