git.iko.soy/typeable/nixpkgs
on master help sign in
lf: 11 -> 12

And switch to buildGoModule.

commit97d35b251b2547dc7196193afb63c643717220d0 authorMichael Weiss <dev.primeos@gmail.com> dateSun 21 Apr 2019, 11:44 (8 years ago) parent9960ff9
2 files changed+6−29
pkgs/tools/misc/lf/default.nix+6−9 pkgs/tools/misc/lf/deps.nix−20
pkgs/tools/misc/lf/default.nix+6−9
@@ -1,29 +1,26 @@
1−{ stdenv, buildGoPackage, fetchFromGitHub }:
1+{ buildGoModule, fetchFromGitHub, lib }:
22
3−buildGoPackage rec {
3+buildGoModule rec {
44 name = "lf-${version}";
5− version = "11";
5+ version = "12";
66
77 src = fetchFromGitHub {
88 owner = "gokcehan";
99 repo = "lf";
1010 rev = "r${version}";
11− sha256 = "13622sx6xmbm8gf38dn8y8mkfnlbpamg4hmzsy9jnzg4h8qbjm6b";
11+ sha256 = "1pjydnwlc6mrnwz13s13c91nvjvb1ibwl944ppg8xq8dcy9b2cs4";
1212 };
1313
14− goPackagePath = "github.com/gokcehan/lf";
15− goDeps = ./deps.nix;
14+ modSha256 = "14fvn8yjm9cnpsmzgxw2dypr3h8h36mxrbk7zma42w8rsp46jpz7";
1615
1716 # TODO: Setting buildFlags probably isn't working properly. I've tried a few
1817 # variants, e.g.:
1918 # - buildFlags = "-ldflags \"-s -w -X 'main.gVersion=${version}'\"";
2019 # - buildFlags = "-ldflags \\\"-X ${goPackagePath}/main.gVersion=${version}\\\"";
21−
2220 # Override the build phase (to set buildFlags):
2321 buildPhase = ''
2422 runHook preBuild
2523 runHook renameImports
26− cd go/src/${goPackagePath}
2724 go install -ldflags="-s -w -X main.gVersion=r${version}"
2825 runHook postBuild
2926 '';
@@ -32,7 +29,7 @@ buildGoPackage rec {
3229 install -D --mode=444 lf.1 $out/share/man/man1/lf.1
3330 '';
3431
35− meta = with stdenv.lib; {
32+ meta = with lib; {
3633 description = "A terminal file manager written in Go and heavily inspired by ranger";
3734 longDescription = ''
3835 lf (as in "list files") is a terminal file manager written in Go. It is
pkgs/tools/misc/lf/deps.nixdeleted−20
@@ -1,20 +0,0 @@
1−[
2− {
3− goPackagePath = "github.com/nsf/termbox-go";
4− fetch = {
5− type = "git";
6− url = "https://github.com/nsf/termbox-go";
7− rev = "02980233997d87bbda048393d47b4d453f7a398d"; # master
8− sha256 = "1zxysi00bk7bv5ka6vn9dnzk5q9wjp0252cm3v6l2hbrcx7405zw";
9− };
10− }
11− {
12− goPackagePath = "github.com/mattn/go-runewidth";
13− fetch = {
14− type = "git";
15− url = "https://github.com/mattn/go-runewidth";
16− rev = "3ee7d812e62a0804a7d0a324e0249ca2db3476d3"; # v0.0.4
17− sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
18− };
19− }
20−]