From b82abc68ff187c5dd9638a01a72499244752bb2f Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Tue, 12 Mar 2024 10:01:46 -0300 Subject: [PATCH] build: mkdocs plugins --- flake.lock | 66 ++++++++++++++++++++++++++++++++++-------------------- flake.nix | 10 ++++----- 2 files changed, 47 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index cc73cbe5c..c2b9bb4b9 100644 --- a/flake.lock +++ b/flake.lock @@ -1,15 +1,33 @@ { "nodes": { + "carlos": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1710248394, + "narHash": "sha256-Bj6XxMXWSFDxSGG2MvrPmMb9spc7ckdC/A3SW43dsys=", + "owner": "caarlos0", + "repo": "nur", + "rev": "440df6b32462d6f6dbb7ee830c7135371b1eb468", + "type": "github" + }, + "original": { + "owner": "caarlos0", + "repo": "nur", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -20,11 +38,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707689078, - "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=", + "lastModified": 1710222005, + "narHash": "sha256-irXySffHz7b82dZIme6peyAu+8tTJr1zyxcfUPhqUrg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9a9a7552431c4f1a3b2eee9398641babf7c30d0e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -36,25 +70,9 @@ }, "root": { "inputs": { + "carlos": "carlos", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "staging": "staging" - } - }, - "staging": { - "locked": { - "lastModified": 1703777495, - "narHash": "sha256-ISkNWa58+6Uk/nQ47omTETrV+yhKFbnU/wR9n+3ux8g=", - "owner": "caarlos0", - "repo": "nixpkgs", - "rev": "e1d1738a056a052aedb6560c240b2749af33fee0", - "type": "github" - }, - "original": { - "owner": "caarlos0", - "ref": "wip", - "repo": "nixpkgs", - "type": "github" + "nixpkgs": "nixpkgs_2" } }, "systems": { diff --git a/flake.nix b/flake.nix index fdb4da415..2664507b5 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,14 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - staging.url = "github:caarlos0/nixpkgs/wip"; + carlos.url = "github:caarlos0/nur"; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { nixpkgs, staging, flake-utils, ... }: + outputs = { nixpkgs, carlos, flake-utils, ... }: flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; - staging-pkgs = staging.legacyPackages.${system}; + cpkgs = carlos.packages.${system}; in { packages.default = pkgs.buildGoModule { @@ -41,8 +41,8 @@ mkdocs-material mkdocs-redirects mkdocs-minify - staging-pkgs.pkgs.python311Packages.mkdocs-rss-plugin # https://github.com/NixOS/nixpkgs/pull/277350 - staging-pkgs.pkgs.python311Packages.mkdocs-include-markdown-plugin # https://github.com/NixOS/nixpkgs/pull/277351 + cpkgs.mkdocs-rss-plugin # https://github.com/NixOS/nixpkgs/pull/277350 + cpkgs.mkdocs-include-markdown-plugin # https://github.com/NixOS/nixpkgs/pull/277351 ] ++ mkdocs-material.passthru.optional-dependencies.git; }; }