Merge pull request #32697 from yrashk/camlistore-perkeep

camlistore: 0.9 -> perkeep 20170505

authored by Graham Christensen and committed by GitHub 13d80cba e545356a

+32 -36
-35
pkgs/applications/misc/camlistore/default.nix
··· 1 - { stdenv, lib, go, fetchgit, git, buildGoPackage }: 2 - 3 - buildGoPackage rec { 4 - name = "camlistore-${version}"; 5 - version = "0.9"; 6 - 7 - src = fetchgit { 8 - url = "https://github.com/camlistore/camlistore"; 9 - rev = "refs/tags/${version}"; 10 - sha256 = "1ypplr939ny9drsdngapa029fgak0wic8sbna588m79cbl17psya"; 11 - leaveDotGit = true; 12 - }; 13 - 14 - buildInputs = [ git ]; 15 - 16 - goPackagePath = ""; 17 - buildPhase = '' 18 - cd go/src/camlistore 19 - go run make.go 20 - ''; 21 - 22 - installPhase = '' 23 - mkdir -p $bin/bin 24 - rm bin/README 25 - cp bin/* $bin/bin 26 - ''; 27 - 28 - meta = with stdenv.lib; { 29 - description = "A way of storing, syncing, sharing, modelling and backing up content"; 30 - homepage = https://camlistore.org; 31 - license = licenses.asl20; 32 - maintainers = with maintainers; [ cstrahan ]; 33 - platforms = platforms.unix; 34 - }; 35 - }
+31
pkgs/applications/misc/perkeep/default.nix
··· 1 + { stdenv, lib, go_1_8, fetchzip, git }: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "perkeep-${version}"; 5 + version = "20170505"; 6 + 7 + src = fetchzip { 8 + url = "https://perkeep.org/dl/monthly/camlistore-${version}-src.zip"; 9 + sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa"; 10 + }; 11 + 12 + buildInputs = [ git go_1_8 ]; 13 + 14 + goPackagePath = ""; 15 + buildPhase = '' 16 + go run make.go 17 + ''; 18 + 19 + installPhase = '' 20 + mkdir -p $out/bin 21 + cp bin/* $out/bin 22 + ''; 23 + 24 + meta = with stdenv.lib; { 25 + description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; 26 + homepage = https://perkeep.org; 27 + license = licenses.asl20; 28 + maintainers = with maintainers; [ cstrahan ]; 29 + platforms = platforms.unix; 30 + }; 31 + }
+1 -1
pkgs/top-level/all-packages.nix
··· 14122 14122 openjpeg = openjpeg_1; 14123 14123 }; 14124 14124 14125 - camlistore = callPackage ../applications/misc/camlistore { }; 14125 + perkeep = callPackage ../applications/misc/perkeep { }; 14126 14126 14127 14127 canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; 14128 14128