From aa0f6f3536694da02c53901bbd470ef0a3eb153f Mon Sep 17 00:00:00 2001 From: Philip Potter Date: Sun, 15 Mar 2020 14:00:39 +0000 Subject: [PATCH 1/3] Add dhall-golang to official list --- .github/CONTRIBUTING.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 1c75336b4..f13cc8886 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -90,7 +90,7 @@ actively maintained implementations of the Dhall language. Votes are made using the GitHub pull request review feature. Each implementation gets one vote. -At the time of this writing the four actively supported implementations of Dhall +At the time of this writing the five actively supported implementations of Dhall are: * [`dhall-haskell` - Haskell bindings to Dhall](https://github.com/dhall-lang/dhall-haskell) @@ -109,6 +109,10 @@ are: Led by @Nadrieril +* [`dhall-golang` - Go bindings to Dhall](https://github.com/philandstuff/dhall-golang) + + Led by @philandstuff + Each of those implementations get one vote cast by the lead contributor for each implementation. From 439f04c718835cb4333e78f2be1bcfa51b59cfec Mon Sep 17 00:00:00 2001 From: Philip Potter Date: Sun, 15 Mar 2020 14:02:51 +0000 Subject: [PATCH 2/3] Add dhall-golang to the website This uses `fetchzip` to get a zip file. We could maybe also use this for the github logo? --- nixops/index.html | 2 ++ nixops/website.nix | 1 + release.nix | 8 ++++++++ 3 files changed, 11 insertions(+) diff --git a/nixops/index.html b/nixops/index.html index e42efdd2e..3df8d9db2 100644 --- a/nixops/index.html +++ b/nixops/index.html @@ -148,6 +148,8 @@ Ruby logoRuby
Rust logoRust +
+ Go logoGo
  • diff --git a/nixops/website.nix b/nixops/website.nix index 52d36e5a6..a94a63558 100644 --- a/nixops/website.nix +++ b/nixops/website.nix @@ -27,6 +27,7 @@ runCommand "try-dhall" {} '' ${coreutils}/bin/ln --symbolic ${logo.dhallSmall} $out/img/dhall-small-logo.svg ${coreutils}/bin/ln --symbolic ${logo.discourse} $out/img/discourse-logo.svg ${coreutils}/bin/ln --symbolic ${logo.github}/PNG/GitHub-Mark-32px.png $out/img/github-logo.png + ${coreutils}/bin/ln --symbolic ${logo.golang}/Go-Logo/SVG/Go-Logo_Blue.svg $out/img/go-logo.svg ${coreutils}/bin/ln --symbolic ${logo.haskell} $out/img/haskell-logo.png ${coreutils}/bin/ln --symbolic ${logo.json} $out/img/json-logo.svg ${coreutils}/bin/ln --symbolic ${logo.kops} $out/img/kops-logo.svg diff --git a/release.nix b/release.nix index 450e03544..8f1c13cb7 100644 --- a/release.nix +++ b/release.nix @@ -180,6 +180,14 @@ let sha256 = "0mrjzv690g9mxljzxsvay8asyr8vlxhhs9smmax7mp3psd49b43g"; }; + golang = + pkgsNew.fetchzip { + # See also https://blog.golang.org/go-brand + url = "https://storage.googleapis.com/golang-assets/go-logos-v1.0.zip"; + sha256 = "06vlpk22nxl1a3mz9rpk9fyq483rc4ml8f7lkkfqmabbia9ah7np"; + stripRoot = false; + }; + ruby = pkgsNew.fetchurl { url = "https://upload.wikimedia.org/wikipedia/commons/7/73/Ruby_logo.svg"; From cb9ce11f0fc39a81f29e1444f9a7d27395df04a7 Mon Sep 17 00:00:00 2001 From: Philip Potter Date: Mon, 16 Mar 2020 16:18:33 +0000 Subject: [PATCH 3/3] order languages alphabetically --- nixops/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixops/index.html b/nixops/index.html index 3df8d9db2..67aba4bca 100644 --- a/nixops/index.html +++ b/nixops/index.html @@ -141,6 +141,8 @@
    Clojure logoClojure
    + Go logoGo +
    Haskell logoHaskell
    Nix logoNix @@ -148,8 +150,6 @@ Ruby logoRuby
    Rust logoRust -
    - Go logoGo