From f9f1939aaff05bcc19987a6143f0c620662fbc36 Mon Sep 17 00:00:00 2001 From: Jez Cope Date: Mon, 10 Jul 2023 17:20:58 +0100 Subject: [PATCH] Add twitter archive --- flake.lock | 15 ++++++++++++++- flake.nix | 10 ++++++++-- nix/build.nix | 5 +++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 0247556..5547c23 100644 --- a/flake.lock +++ b/flake.lock @@ -33,7 +33,20 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "twitter-archive": "twitter-archive" + } + }, + "twitter-archive": { + "flake": false, + "locked": { + "narHash": "sha256-XOaTvEWedFtofiTODpzzXyq60NZ8DsS4Tp2bLijIELE=", + "type": "tarball", + "url": "https://codeberg.org/api/v1/repos/jezcope/twitter-archive/archive/main.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://codeberg.org/api/v1/repos/jezcope/twitter-archive/archive/main.tar.gz" } } }, diff --git a/flake.nix b/flake.nix index 9185e44..11e08ed 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,12 @@ inputs.nixpkgs.url = "github:NixOS/nixpkgs"; inputs.flake-utils.url = "github:numtide/flake-utils"; + inputs.twitter-archive = { + url = "https://codeberg.org/api/v1/repos/jezcope/twitter-archive/archive/main.tar.gz"; + flake = false; + }; - outputs = { self, nixpkgs, flake-utils }: + outputs = { self, nixpkgs, flake-utils, twitter-archive }: { overlay = self: super: let @@ -20,7 +24,9 @@ paths = [ iosevka iosevka-aile iosevka-etoile ]; }; - erambler = pkgs.callPackage ./nix/build.nix { inherit fonts; }; + erambler = pkgs.callPackage ./nix/build.nix { inherit fonts twitter-archive; }; + + inherit twitter-archive; }; nixosModule = import ./nix/server.nix { inherit self; }; diff --git a/nix/build.nix b/nix/build.nix index ad1f2f5..aef5850 100644 --- a/nix/build.nix +++ b/nix/build.nix @@ -1,15 +1,16 @@ -{ pkgs, fonts, lndir, ... }: +{ pkgs, fonts, lndir, twitter-archive, ... }: with pkgs; stdenv.mkDerivation { name = "erambler-html"; src = ../.; - nativeBuildInputs = [ hugo fonts ]; + nativeBuildInputs = [ hugo fonts twitter-archive ]; buildPhase = "hugo"; installPhase = '' mkdir $out cp -R public/* public/.well-known "$out" mkdir -p "$out/font" ${lndir}/bin/lndir -silent ${fonts} "$out/font" + ln -s ${twitter-archive} "$out/twitter-archive" ''; }