diff --git a/default.nix b/default.nix index 8902894..73df194 100644 --- a/default.nix +++ b/default.nix @@ -1,21 +1,17 @@ -{ pkgs ? import {} -, callPackage ? pkgs.callPackage -, wandardFrontUtils ? callPackage ( - builtins.fetchGit { - url = "https://git.wizbos.club/wizbos-pub/wand-front-utils.git"; - rev = "4565d0858fc62064d619454b558689649af28712"; - } - ) {} -, ... -}: +# SPDX-FileCopyrightText: 2020 Serokell +# +# SPDX-License-Identifier: MPL-2.0 -with wandardFrontUtils; -mkWandardFront { - src = ./.; - name = "gen2.space"; - description = "notgne2's shitty pages"; - backgroundColor = "#220044"; - themeColor = "#004400"; - routes = - [ "/" "/about" "/404" "/posts" "/posts/viveahk" "/posts/librebasics" ]; -} +(import + ( + let + lock = builtins.fromJSON (builtins.readFile ./flake.lock); + in + fetchTarball { + url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; + } + ) + { + src = ./.; + }).defaultNix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..e604e56 --- /dev/null +++ b/flake.lock @@ -0,0 +1,131 @@ +{ + "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1606424373, + "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1606424373, + "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1612996220, + "narHash": "sha256-l2kzWXxL3vXr8VxUzRtORPJS0nFQ3E5kBPF/AYAK0wI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "758b29b5a28b818e311ad540637a5c1e40867489", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "pnpm2nix": { + "flake": false, + "locked": { + "lastModified": 1613295715, + "narHash": "sha256-bj4daCwh8AerFz65yUYRBkJTdP+PdvGKNozdbAdHiUI=", + "ref": "master", + "rev": "55487e9b92017d9cadf7e6ed4c090e15e7eaf8a9", + "revCount": 88, + "type": "git", + "url": "ssh://git@github.com/notgne2/pnpm2nix.git" + }, + "original": { + "type": "git", + "url": "ssh://git@github.com/notgne2/pnpm2nix.git" + } + }, + "root": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "utils": "utils", + "wand": "wand" + } + }, + "utils": { + "locked": { + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_2": { + "locked": { + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "wand": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": [ + "nixpkgs" + ], + "pnpm2nix": "pnpm2nix", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1613297553, + "narHash": "sha256-otO6Hm7UKWqtjUHeJ6Uualm55NB3MI8WQg83I/tKIRM=", + "ref": "master", + "rev": "6fbcf18e3bad6accdeca0f9ff5d25509b3e8536f", + "revCount": 56, + "type": "git", + "url": "ssh://git@git.wizbos.club/wizbos-pub/wand-front-utils.git" + }, + "original": { + "type": "git", + "url": "ssh://git@git.wizbos.club/wizbos-pub/wand-front-utils.git" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..1e94db7 --- /dev/null +++ b/flake.nix @@ -0,0 +1,34 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + + wand.url = "git+ssh://git@git.wizbos.club/wizbos-pub/wand-front-utils.git"; + wand.inputs.nixpkgs.follows = "nixpkgs"; + + utils.url = "github:numtide/flake-utils"; + + flake-compat = { + url = "github:edolstra/flake-compat"; + flake = false; + }; + }; + + outputs = { self, nixpkgs, utils, wand, ... }: + utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { inherit system; }; + in + { + packages.gen2space = wand.lib.${system}.mkWandardFront { + src = ./.; + name = "gen2.space"; + description = "notgne2's shitty pages"; + backgroundColor = "#220044"; + themeColor = "#004400"; + routes = + [ "/" "/about" "/404" "/posts" "/posts/viveahk" "/posts/librebasics" ]; + }; + + defaultPackage = self.packages.${system}.gen2space; + }); +}