From b8c598666364f85b2084b88b370c729dd8c212b8 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Thu, 15 Feb 2024 19:55:04 +0000 Subject: [PATCH 1/3] nix: use 'nixpkgs-unstable' --- flake.lock | 1 + flake.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index d0a78d0..aa4a4f2 100644 --- a/flake.lock +++ b/flake.lock @@ -26,6 +26,7 @@ }, "original": { "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 07513cd..5b3277a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Ambroisie's CV"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; futils.url = "github:numtide/flake-utils"; }; From bf73469b61176854ef9dbd40dcd1b550d8b5875d Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Thu, 15 Feb 2024 19:55:14 +0000 Subject: [PATCH 2/3] nix: bump inputs --- flake.lock | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index aa4a4f2..4cbea42 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "futils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -17,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1679689661, - "narHash": "sha256-V0+vWTOKCv/N2GrbrCQOBTTFABAcR51k3vBysEBSXJg=", + "lastModified": 1707877513, + "narHash": "sha256-sp0w2apswd3wv0sAEF7StOGHkns3XUQaO5erhWFZWXk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8d709fdd24eaaa8c1c1fa660fc141b8dfc0beaa0", + "rev": "89653a03e0915e4a872788d10680e7eec92f8600", "type": "github" }, "original": { @@ -36,6 +39,21 @@ "futils": "futils", "nixpkgs": "nixpkgs" } + }, + "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", From 20b77e98e6a001fd5db502e4128ff6e228cdb915 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Thu, 15 Feb 2024 19:55:48 +0000 Subject: [PATCH 3/3] nix: update TeX Live package definition --- flake.nix | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 5b3277a..7bfc166 100644 --- a/flake.nix +++ b/flake.nix @@ -14,19 +14,16 @@ pkgs = nixpkgs.legacyPackages.${system}; buildInputs = with pkgs; [ gnumake - (texlive.combine { - inherit (texlive) - scheme-small - # Build script - latexmk - # Extra packages needed - clearsans - fontaxes - textpos - ifmtarg - marvosym - ; - }) + (texliveSmall.withPackages (ps: with ps; [ + # Build script + latexmk + # Extra packages needed + clearsans + fontaxes + textpos + ifmtarg + marvosym + ])) ]; in {