From ba26339b35f4ec5461f044b9ac08a7c2be4143f3 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 19 Mar 2021 11:29:25 -0400 Subject: Add bearssl, gmni, and gmnisrv Eventually I'll just upstream these to nixpkgs-dev. I also want to make z into a gemini-compatible zettlekasten. All in due time. --- Biz/Bild/Deps.nix | 3 +++ Biz/Bild/Deps/bearssl.nix | 24 ++++++++++++++++++++++++ Biz/Bild/Deps/gmni.nix | 20 ++++++++++++++++++++ Biz/Bild/Deps/gmnisrv.nix | 21 +++++++++++++++++++++ Biz/Bild/Rules.nix | 2 ++ 5 files changed, 70 insertions(+) create mode 100644 Biz/Bild/Deps/bearssl.nix create mode 100644 Biz/Bild/Deps/gmni.nix create mode 100644 Biz/Bild/Deps/gmnisrv.nix diff --git a/Biz/Bild/Deps.nix b/Biz/Bild/Deps.nix index dd1ed45..a24e2d1 100644 --- a/Biz/Bild/Deps.nix +++ b/Biz/Bild/Deps.nix @@ -53,4 +53,7 @@ in rec wemux = pkgs.callPackage ./Deps/wemux.nix {}; guile-opengl = pkgs.callPackage ./Deps/guile-opengl.nix {}; inspekt3d = pkgs.callPackage ./Deps/inspekt3d.nix {}; + gmnisrv = pkgs.callPackage ./Deps/gmnisrv.nix {}; + bearssl = pkgs.callPackage ./Deps/bearssl.nix {}; + gmni = pkgs.callPackage ./Deps/gmni.nix {}; } diff --git a/Biz/Bild/Deps/bearssl.nix b/Biz/Bild/Deps/bearssl.nix new file mode 100644 index 0000000..bbede64 --- /dev/null +++ b/Biz/Bild/Deps/bearssl.nix @@ -0,0 +1,24 @@ +{stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "bearssl-2021-01-27"; + version = "79b1a9996c094ff593ae50bc4edc1f349f39dd6d"; + src = fetchgit { + url = "https://www.bearssl.org/git/BearSSL"; + rev = version; + sha256 = "0iljfg575g2n4jw6mjfi1xk749pnhsg9zpskqs0kvzch5hn5cvlf"; + }; + installPhase = '' + mkdir -p $out/{include,lib,bin} + cp inc/* $out/include + cp build/libbearssl.a $out/lib/libbearssl.a + cp build/brssl $out/bin/brssl + ''; + meta = with stdenv.lib; { + description = "An implementation of the SSL/TLS protocol in C"; + homepage = "https://bearssl.org/"; + license = licenses.mit; + maintainers = with maintainers; [ bsima ]; + platforms = platforms.all; + }; +} diff --git a/Biz/Bild/Deps/gmni.nix b/Biz/Bild/Deps/gmni.nix new file mode 100644 index 0000000..092638d --- /dev/null +++ b/Biz/Bild/Deps/gmni.nix @@ -0,0 +1,20 @@ +{stdenv, fetchgit, pkg-config, bearssl, scdoc}: + +stdenv.mkDerivation { + name = "gmni"; + version = "77b73efb"; + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/gmni"; + rev = version; + sha256 = "1wvnzyv7vyddcd39y6q5aflpnnsdl4k4y5aj5ssb7vgkld0h1b7r"; + }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ bearssl scdoc ]; + meta = with stdenv.lib; { + description = "A Gemini client"; + homepage = "https://git.sr.ht/~sircmpwn/gmni"; + license = licenses.gpl3; + maintainers = with maintainers; [ bsima ]; + platforms = platforms.all; + }; +} diff --git a/Biz/Bild/Deps/gmnisrv.nix b/Biz/Bild/Deps/gmnisrv.nix new file mode 100644 index 0000000..b40e8f5 --- /dev/null +++ b/Biz/Bild/Deps/gmnisrv.nix @@ -0,0 +1,21 @@ +{stdenv, fetchgit, pkg-config, openssl, mailcap, scdoc}: + +stdenv.mkDerivation { + name = "gmnvisrv"; + version = "f23ec10a"; + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/gmnisrv"; + rev = version; + sha256 = "1d9rjx0s092yfzjxd2yvzixhqgg883nlnmsysgp21w75n2as354n"; + }; + MIMEDB = "${mailcap}/etc/mime.types"; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl mailcap scdoc ]; + meta = with stdenv.lib; { + description = "A simple Gemini protocol server"; + homepage = "https://git.sr.ht/~sircmpwn/gmnisrv"; + license = licenses.gpl3; + maintainers = with maintainers; [ bsima ]; + platforms = platforms.all; + }; +} diff --git a/Biz/Bild/Rules.nix b/Biz/Bild/Rules.nix index fb36100..800f1df 100644 --- a/Biz/Bild/Rules.nix +++ b/Biz/Bild/Rules.nix @@ -149,6 +149,8 @@ in rec { nixpkgs.python37Packages.pylint nixpkgs.shellcheck nixpkgs.wemux + nixpkgs.gmnisrv + nixpkgs.gmni (pkgs.writeScriptBin "ftags" (builtins.readFile ../Ide/ftags.sh)) ] ++ lib.optional nixpkgs.stdenv.isLinux [ # scheme deps (i think these are broken on macOS) -- cgit v1.2.3