From 2daa94420395932c0233f8f9f4d8b3e279e847dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Fri, 9 Apr 2021 19:14:56 +0100
Subject: [PATCH 1/4] Rename the package to tlaternet-webserver
This is less confusing than naming it the same as the server domain
name.
---
Cargo.toml | 2 +-
flake.nix | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 79e1dc1..a700d8a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "tlaternet"
+name = "tlaternet-webserver"
version = "0.1.0"
authors = ["Tristan Daniël Maat <tm@tlater.net>"]
edition = "2018"
diff --git a/flake.nix b/flake.nix
index 5ed0bdb..09ae8d8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,11 +20,11 @@
outputs = { self, nixpkgs, flake-utils, rust-overlay, naersk }@inputs:
flake-utils.lib.simpleFlake {
inherit self nixpkgs;
- name = "tlaternet";
+ name = "tlaternet-webserver";
preOverlays = [ rust-overlay.overlay ];
overlay = final: prev: {
- tlaternet = let
+ tlaternet-webserver = let
# The rust toolchain to use
toolchain =
prev.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
From 93285fc42675a8f05189221696652d4bee5d0461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Fri, 9 Apr 2021 19:15:27 +0100
Subject: [PATCH 2/4] Rename flake packages collection
---
flake.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/flake.nix b/flake.nix
index 09ae8d8..ddf882a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,7 +43,7 @@
in rec {
# The packages provided by this flake
- tlaternet = {
+ packages = {
webserver = prev.callPackage
({ rustPlatform, openssl, pkgconfig, ... }:
naersk-lib.buildPackage {
@@ -53,7 +53,7 @@
root = ./.;
}) { };
};
- defaultPackage = tlaternet.webserver;
+ defaultPackage = packages.webserver;
# A dev shell to hack manually; note this includes
# additional toolchain components
From ba9fa8f37d31cbb3f5b6673f748880e5dcf3f8bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Fri, 9 Apr 2021 19:14:56 +0100
Subject: [PATCH 3/4] Rename the package to tlaternet-webserver
This is less confusing than naming it the same as the server domain
name.
---
Cargo.lock | 2 +-
Cargo.toml | 2 +-
flake.nix | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 1e2ab7c..839bc20 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2569,7 +2569,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
-name = "tlaternet"
+name = "tlaternet-webserver"
version = "0.1.0"
dependencies = [
"check-if-email-exists",
diff --git a/Cargo.toml b/Cargo.toml
index 79e1dc1..a700d8a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "tlaternet"
+name = "tlaternet-webserver"
version = "0.1.0"
authors = ["Tristan Daniël Maat <tm@tlater.net>"]
edition = "2018"
diff --git a/flake.nix b/flake.nix
index 5ed0bdb..09ae8d8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,11 +20,11 @@
outputs = { self, nixpkgs, flake-utils, rust-overlay, naersk }@inputs:
flake-utils.lib.simpleFlake {
inherit self nixpkgs;
- name = "tlaternet";
+ name = "tlaternet-webserver";
preOverlays = [ rust-overlay.overlay ];
overlay = final: prev: {
- tlaternet = let
+ tlaternet-webserver = let
# The rust toolchain to use
toolchain =
prev.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
From ff25f151d3c170c7290b83be5cbdb1fd84261997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Fri, 9 Apr 2021 19:15:27 +0100
Subject: [PATCH 4/4] Rename flake packages collection
---
flake.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/flake.nix b/flake.nix
index 09ae8d8..ddf882a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,7 +43,7 @@
in rec {
# The packages provided by this flake
- tlaternet = {
+ packages = {
webserver = prev.callPackage
({ rustPlatform, openssl, pkgconfig, ... }:
naersk-lib.buildPackage {
@@ -53,7 +53,7 @@
root = ./.;
}) { };
};
- defaultPackage = tlaternet.webserver;
+ defaultPackage = packages.webserver;
# A dev shell to hack manually; note this includes
# additional toolchain components