Fix build after updating dependencies & make scripts posix-compliant

.travis.yml

@@ -25,7 +25,7 @@ matrix:
     os: osx
 
   # *BSD
-  - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1
+  # - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1
   - env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1
 
   # Windows
@@ -33,6 +33,7 @@ matrix:
 
 before_install:
 - set -e
+- command -v apt-get && sudo apt-get install -y libclang-dev
 - rustup self update
 
 install:

Cargo.toml

@@ -11,11 +11,11 @@ edition = "2018"
 owning_ref = "0.4"
 linked-hash-map = "0.5"
 rocket = { version = "0.4.4", default-features = false }
-askama = "0.8"
+askama = "0.9"
-lazy_static = "1.2"
+lazy_static = "1.4"
-rand = { version = "0.6", features = ["nightly"] }
+rand = { version = "0.7", features = ["nightly"] }
 gpw = "0.1"
-syntect = "3.0"
+syntect = "4.1"
 serde_derive = "1.0"
 
 [profile.release]

README.md

@@ -1,9 +1,9 @@
 # bin
 a paste bin.
 
-A paste bin that's actually minimalist. No database requirement, no commenting functionality, no self-destructing or time bomb messages and no social media integration—just an application to quickly send snippits of text to people.
+A paste bin that's actually minimalist. No database requirement, no commenting functionality, no self-destructing or time bomb messages and no social media integration—just an application to quickly send snippets of text to people.
 
-[bin](https://bin.doyle.la/) is written in Rust in around 200 lines of code. It's fast, it's simple, there's code highlighting and you can ⌘+A without going to the 'plain' page. It's revolutionary in the paste bin industry, disrupting markets and pushing boundaries never seen before.
+[bin](https://bin.gy/) is written in Rust in around 200 lines of code. It's fast, it's simple, there's code highlighting and you can ⌘+A without going to the 'plain' page. It's revolutionary in the paste bin industry, disrupting markets and pushing boundaries never seen before.
 
 ##### so how do you get bin?
 
@@ -36,9 +36,9 @@ bin's only configuration value is `BIN_BUFFER_SIZE` which defaults to 2000. Chan
 ##### is there curl support?
 
 ```bash
-$ curl -X PUT --data 'hello world' bin.doyle.la
+$ curl -X PUT --data 'hello world' https://bin.gy
-https://bin.doyle.la/cateettary
+https://bin.gy/cateettary
-$ curl https://bin.doyle.la/cateettary
+$ curl https://bin.gy/cateettary
 hello world
 ```
 

ci/before_deploy.sh

@@ -19,8 +19,8 @@ main() {
 
     cross rustc --bin bin --target $TARGET --release -- -C lto
 
-    [ "$TARGET" == "arm-unknown-linux-gnueabi" ] || [ "$TARGET" == "x86_64-pc-windows-gnu" ] || strip target/$TARGET/release/bin
+    [ "$TARGET" = "arm-unknown-linux-gnueabi" ] || [ "$TARGET" = "x86_64-pc-windows-gnu" ] || strip target/$TARGET/release/bin
-    cp target/$TARGET/release/bin $stage/
+    cp target/$TARGET/release/* $stage/
 
     cd $stage
     tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz *

ci/script.sh

@@ -4,7 +4,7 @@ set -ex
 
 # TODO This is the "test phase", tweak it as you see fit
 main() {
-    cross build --target $TARGET
+    cross check
     cross build --target $TARGET --release
 
     if [ ! -z $DISABLE_TESTS ]; then
@@ -12,7 +12,6 @@ main() {
     fi
 
     cross test --target $TARGET
-    cross test --target $TARGET --release
 }
 
 # we don't run the "test phase" when doing deploys

shell.nix

@@ -2,8 +2,8 @@ with import <nixpkgs> {};
 let src = fetchFromGitHub {
       owner = "mozilla";
       repo = "nixpkgs-mozilla";
-      # commited 12/2/2019
+      # commited 19/2/2020
-      rev = "37f7f33ae3ddd70506cd179d9718621b5686c48d";
+      rev = "e912ed483e980dfb4666ae0ed17845c4220e5e7c";
       sha256 = "0cmvc9fnr38j3n0m4yf0k6s2x589w1rdby1qry1vh435v79gp95j";
    };
 in
@@ -14,6 +14,9 @@ stdenv.mkDerivation {
     buildInputs = [
         latest.rustChannels.nightly.cargo
         latest.rustChannels.nightly.rust
+        stdenv.cc.libc
     ] ++
     pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security;
+
+    LIBCLANG_PATH="${llvmPackages.libclang}/lib";
 }

templates/base.html

@@ -4,6 +4,8 @@
     <meta charset="UTF-8">
     <title>bin.</title>
 
+    <link rel="help" href="https://github.com/w4/bin">
+
     <style>
         * { box-sizing: border-box; }
 
@@ -25,4 +27,4 @@
     </style>
 </head>
 <body>{% block content %}{% endblock content %}</body>
-</html>
+</html>