alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

init: go-rice at 1.0.0

Browse source
This commit is contained in:
David Arnold 2020-07-29 10:13:01 -05:00
parent c2618fc055
commit ab1f69b099
No known key found for this signature in database
GPG key ID: 6D6A936E69C59D08
3 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/tools/misc/go.rice/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "go.rice";
version = "1.0.0";
src = fetchFromGitHub {
owner = "GeertJohan";
repo = "go.rice";
rev = "v${version}";
sha256 = "0m1pkqnx9glf3mlx5jdaby9yxccbl02jpjgpi4m7x1hb4s2gn6vx";
};
vendorSha256 = "0cb5phyl2zm1xnkhvisv0lzgknsi93yzmpayg30w7jc6z4icwnw7";
subPackages = [ "." "rice" ];
meta = with stdenv.lib; {
homepage = "https://github.com/GeertJohan/go.rice";
description = "A Go package that makes working with resources such as html, js, css, images, templates very easy.";
license = licenses.bsd2;
maintainers = with maintainers; [ blaggacao ];
};
}

20
pkgs/tools/security/cfssl/default.nix
View file

@ -1,19 +1,5 @@
{ stdenv, buildGoModule, fetchFromGitHub }: { stdenv, buildGoModule, fetchFromGitHub, go-rice }:
let
# Embed static files in the built-in webserver
rice = buildGoModule rec {
name = "rice";
src = fetchFromGitHub {
owner = "GeertJohan";
repo = "go.rice";
rev = "v1.0.0";
sha256 = "0m1pkqnx9glf3mlx5jdaby9yxccbl02jpjgpi4m7x1hb4s2gn6vx";
};
vendorSha256 = "0cb5phyl2zm1xnkhvisv0lzgknsi93yzmpayg30w7jc6z4icwnw7";
subPackages = [ "rice" ];
};
in
buildGoModule rec { buildGoModule rec {
pname = "cfssl"; pname = "cfssl";
version = "1.4.1"; version = "1.4.1";
@ -38,9 +24,11 @@ buildGoModule rec {
vendorSha256 = null; vendorSha256 = null;
nativeBuildInputs = [ go-rice ];
preBuild = '' preBuild = ''
pushd cli/serve pushd cli/serve
${rice}/bin/rice embed-go rice embed-go
popd popd
''; '';

4
pkgs/top-level/all-packages.nix
View file

@ -1911,6 +1911,8 @@ in
gdrive = callPackage ../applications/networking/gdrive { }; gdrive = callPackage ../applications/networking/gdrive { };
go-rice = callPackage ../tools/misc/go.rice {};
go-2fa = callPackage ../tools/security/2fa {}; go-2fa = callPackage ../tools/security/2fa {};
go-dependency-manager = callPackage ../development/tools/gdm { }; go-dependency-manager = callPackage ../development/tools/gdm { };
@ -7344,7 +7346,7 @@ in
uget = callPackage ../tools/networking/uget { }; uget = callPackage ../tools/networking/uget { };
uget-integrator = callPackage ../tools/networking/uget-integrator { }; uget-integrator = callPackage ../tools/networking/uget-integrator { };
ugrep = callPackage ../tools/text/ugrep { }; ugrep = callPackage ../tools/text/ugrep { };
uif2iso = callPackage ../tools/cd-dvd/uif2iso { }; uif2iso = callPackage ../tools/cd-dvd/uif2iso { };