From bab3594b54dc51d340a8780a53dcb851ea77ad6b Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 22 Mar 2017 16:52:52 -0500 Subject: [PATCH] gogs: 0.9.113 -> 0.10.18 --- .../version-management/gogs/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index b9a1f2e7a843..4ab97cc06d2a 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -3,25 +3,26 @@ , sqliteSupport ? true }: +with stdenv.lib; + buildGoPackage rec { name = "gogs-${version}"; - version = "0.9.113"; + version = "0.10.18"; src = fetchFromGitHub { owner = "gogits"; repo = "gogs"; rev = "v${version}"; - sha256 = "1zk83c9jiazfw3221yi2sidp7917q3dxb2xb7wrjg4an18gj46j7"; + sha256 = "1f1dlickjpdilf4j295i9v2h4ig4pf5d2mnpbr59wh14bby4bh0y"; }; patchPhase = '' - substituteInPlace models/repo.go \ - --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' - ''; + patchShebangs . + ''; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - buildFlags = stdenv.lib.optionalString sqliteSupport "-tags sqlite"; + buildFlags = optionalString sqliteSupport "-tags sqlite"; outputs = [ "bin" "out" "data" ]; @@ -30,7 +31,7 @@ buildGoPackage rec { cp -R $src/{public,templates} $data wrapProgram $bin/bin/gogs \ - --prefix PATH : ${stdenv.lib.makeBinPath [ bash git gzip openssh ]} \ + --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} \ --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \ --run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \ --run "ln -fs $data/{public,templates} ." @@ -42,7 +43,7 @@ buildGoPackage rec { meta = { description = "A painless self-hosted Git service"; homepage = "https://gogs.io"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ schneefux ]; + license = licenses.mit; + maintainers = [ maintainers.schneefux ]; }; }