on master help sign in
use nixpkgs from nixos
commitd3b48aab40a318e2c1ce215b1e9dc2bbc5e004b8 authoriko <ilyakooo0@gmail.com> dateSun 25 Apr 2021, 13:45 (5 years ago) parent9768f61
2 files changed+10−11
docs/default.nix+6−7 docs/nix/sources.json+4−4
docs/default.nix+6−7
@@ -15,15 +15,15 @@ let
1515in
1616builtins.listToAttrs (map
1717 (file':
18− let file = if pkgs.lib.hasSuffix ".lhs" file' then lhs2tex file' else file';
18+ let file = if pkgs.lib.hasSuffix ".lhs" file'.file then lhs2tex file'.file else file'.file;
1919 in
2020 {
21− name = filename file';
21+ name = filename file'.file;
2222 value = pkgs.texFunctions.runLaTeX {
2323 rootFile = file;
2424 # , generatePDF ? true # generate PDF, not DVI
2525 # , generatePS ? false # generate PS in addition to DVI
26− extraFiles = [ (sources.TechDoc + "/TechDoc.cls") ];
26+ extraFiles = file'.extraFiles or [ ];
2727 # , compressBlanksInIndex ? true
2828 # , packages ? [ ]
2929 texPackages = {
@@ -38,12 +38,11 @@ builtins.listToAttrs (map
3838 };
3939 };
4040 # , copySources ? false
41− # searchPath = [ (pkgs.lib.cleanSource ./.) ];
4241 };
4342 })
4443 [
45− ./tech_spec.tex
46− ./project_proposal.tex
47− # ./paper.lhs
44+ { file = ./tech_spec.tex; }
45+ { file = ./project_proposal.tex; }
46+ { file = ./paper.lhs; extraFiles = [ (sources.TechDoc + "/TechDoc.cls") ./bibl.bib ]; }
4847 ]
4948)
docs/nix/sources.json+4−4
@@ -36,15 +36,15 @@
3636 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
3737 },
3838 "nixpkgs": {
39− "branch": "master",
39+ "branch": "nixpkgs-unstable",
4040 "description": "Nix Packages collection",
4141 "homepage": "",
4242 "owner": "NixOS",
4343 "repo": "nixpkgs",
44− "rev": "7b2982e22eb3ca5016161abc0946f88bb43b1e09",
45− "sha256": "0qd8dhqvjz2j2k5mnx7cldir2d3mmv37msp337k99dq76wif3xnp",
44+ "rev": "118485230c02d13f62133bce43177ffd49495694",
45+ "sha256": "0qj95jjr8y323zw70lkbngbkvwkchzaic4a5n2b9vwd8lbyf79hq",
4646 "type": "tarball",
47− "url": "https://github.com/NixOS/nixpkgs/archive/7b2982e22eb3ca5016161abc0946f88bb43b1e09.tar.gz",
47+ "url": "https://github.com/NixOS/nixpkgs/archive/118485230c02d13f62133bce43177ffd49495694.tar.gz",
4848 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
4949 }
5050}