tlaternet/tlaternet-templates
Archived
1
0
Fork 0
Code Issues 4 Pull requests Releases Wiki Activity

Update the whole repository #5

Manually merged
tlater merged 4 commits from tlater/switch-to-npmlock2nix into master 2022-06-20 14:45:11 +01:00
Conversation 0 Commits 4 Files changed 15 +9 -9
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d8f81c4a78 - Show all commits

14
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1631561581, "lastModified": 1653893745,
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,16 +17,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1633267966, "lastModified": 1655200170,
"narHash": "sha256-gFKvZ5AmV/dDTKXVxacPbXe4R0BsFpwtVaQxuIm2nnk=", "narHash": "sha256-/yzkX+10sJhYNIcTtZ5ObS+nh/HrJp01XLaubzbRDcU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7daf35532d2d8bf5e6f7f962e6cd13a66d01a71d", "rev": "9ff91ce2e4c5d70551d4c8fd8830931c6c6b26b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-21.05", "ref": "nixos-22.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View file

@ -2,7 +2,7 @@
description = "tlater.net web server contents"; description = "tlater.net web server contents";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
@ -14,7 +14,7 @@
overlay = final: prev: { overlay = final: prev: {
tlaternet-templates = rec { tlaternet-templates = rec {
packages = rec { packages = rec {
nodeEnv = prev.callPackage ./nix/override.nix { }; nodeEnv = prev.callPackage ./nix/override.nix { pkgs = prev; };
templates = prev.callPackage ({ stdenv, nodejs, rename, ... }: templates = prev.callPackage ({ stdenv, nodejs, rename, ... }:
let nodeDeps = nodeEnv.shell.nodeDependencies; let nodeDeps = nodeEnv.shell.nodeDependencies;
in stdenv.mkDerivation { in stdenv.mkDerivation {