tlaternet/tlaternet-webserver
1
0
Fork 0
Code Issues 5 Pull requests Releases Wiki Activity

Migrate to actix-web #8

Manually merged
tlater merged 14 commits from tlater/actix-web into master 2022-09-16 17:44:53 +01:00
Conversation 0 Commits 14 Files changed 12 +50 -81
2 changed files with 50 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3a5d4b9756 - Show all commits

125
flake.lock
View file

@ -15,21 +15,6 @@
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1631561581,
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"naersk": {
"inputs": {
"nixpkgs": [
@ -37,11 +22,11 @@
]
},
"locked": {
"lastModified": 1659610603,
"narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=",
"lastModified": 1662220400,
"narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
"owner": "nmattia",
"repo": "naersk",
"rev": "c6a45e4277fa58abd524681466d3450f896dc094",
"rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
"type": "github"
},
"original": {
@ -50,28 +35,38 @@
"type": "github"
}
},
"naersk_2": {
"inputs": {
"nixpkgs": [
"tlaternet-templates",
"nixpkgs"
]
},
"nix-filter": {
"locked": {
"lastModified": 1632266297,
"narHash": "sha256-J1yeJk6Gud9ef2pEf6aKQemrfg1pVngYDSh+SAY94xk=",
"owner": "nmattia",
"repo": "naersk",
"rev": "ee7edec50b49ab6d69b06d62f1de554efccb1ccd",
"lastModified": 1661201956,
"narHash": "sha256-RizGJH/buaw9A2+fiBf9WnXYw4LZABB5kMAZIEE5/T8=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "3b821578685d661a10b563cba30b1861eec05748",
"type": "github"
},
"original": {
"owner": "nmattia",
"repo": "naersk",
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1663244735,
"narHash": "sha256-+EukKkeAx6ithOLM1u5x4D12ZFuoi6vpPYjhNDmLz1o=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "178fea1414ae708a5704490f4c49ec3320be9815",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1660318005,
"narHash": "sha256-g9WCa9lVUmOV6dYRbEPjv/TLOR5hamjeCcKExVGS3OQ=",
@ -87,19 +82,19 @@
"type": "github"
}
},
"nixpkgs_2": {
"npmlock2nix": {
"flake": false,
"locked": {
"lastModified": 1632408697,
"narHash": "sha256-JqTfu361AwFmV0WszXLAjfukqGxBbHRopRgdp9A2w8s=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a13824fe5e38187fbc75cd598b5c06bdcc13501f",
"lastModified": 1654775747,
"narHash": "sha256-9pXHDpIjmsK5390wmpGHu9aA4QOPpegPBvThHeBlef4=",
"owner": "nix-community",
"repo": "npmlock2nix",
"rev": "5c4f247688fc91d665df65f71c81e0726621aaa8",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-20.09",
"repo": "nixpkgs",
"owner": "nix-community",
"repo": "npmlock2nix",
"type": "github"
}
},
@ -119,36 +114,11 @@
]
},
"locked": {
"lastModified": 1660358625,
"narHash": "sha256-uv+ZtOAEeM5tw78CLdRQmbZyDZYc0piSflthG2kNnrc=",
"lastModified": 1663297375,
"narHash": "sha256-7pjd2x9fSXXynIzp9XiXjbYys7sR6MKCot/jfGL7dgE=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "18354cce8137aaef0d505d6f677e9bbdd542020d",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"tlaternet-templates",
"flake-utils"
],
"nixpkgs": [
"tlaternet-templates",
"nixpkgs"
]
},
"locked": {
"lastModified": 1633400100,
"narHash": "sha256-kHQV7jZ2vVHVI9sfda1mUROVBbQbdfKcbIpKG9WdqGo=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "9c2fc6a62ccbc6f420d71ecac6bf0b84dbbee64f",
"rev": "0678b6187a153eb0baa9688335b002fe14ba6712",
"type": "github"
},
"original": {
@ -159,23 +129,22 @@
},
"tlaternet-templates": {
"inputs": {
"flake-utils": "flake-utils_2",
"naersk": "naersk_2",
"nix-filter": "nix-filter",
"nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay_2"
"npmlock2nix": "npmlock2nix"
},
"locked": {
"lastModified": 1633433130,
"narHash": "sha256-jkW+HV8cJvE86gppOEXQl2ke+bDHJ7SAp8eJp8pJ0N8=",
"lastModified": 1663345814,
"narHash": "sha256-wIl8P+Hv8zHwBATlEoppPNJMpcR2EiQ4dbkgGXszmf8=",
"ref": "master",
"rev": "1232950c06ae16bf17fb16ac1f5f2231e971936b",
"revCount": 16,
"rev": "789431c13cf1e906cbaf48e9b1078056c8ec3cc8",
"revCount": 111,
"type": "git",
"url": "https://gitea.tlater.net/tlaternet/tlaternet.git"
"url": "https://gitea.tlater.net/tlaternet/tlaternet-templates.git"
},
"original": {
"type": "git",
"url": "https://gitea.tlater.net/tlaternet/tlaternet.git"
"url": "https://gitea.tlater.net/tlaternet/tlaternet-templates.git"
}
}
},

6
flake.nix
View file

@ -13,7 +13,7 @@
};
tlaternet-templates = {
url = "git+https://gitea.tlater.net/tlaternet/tlaternet.git";
url = "git+https://gitea.tlater.net/tlaternet/tlaternet-templates.git";
# No need to override anything here; we can save some downloads
# if we rely on the webserver to do that.
};
@ -57,8 +57,8 @@
apps.${system} = {
run-with-templates = let
script = pkgs.writeShellScriptBin "run-with-templates" ''
export ROCKET_TEMPLATE_DIR=${tlaternet-templates.packages.${system}.tlaternet-templates}
${self.packages.${system}.tlaternet-webserver}/bin/tlaternet-webserver
RUST_LOG=info ${self.packages.${system}.tlaternet-webserver}/bin/tlaternet-webserver \
--template-directory ${tlaternet-templates.packages.${system}.default}
'';
in {
type = "app";