From 13b30b26ad13f94a32cc6124ff93553382c0b86f Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Fri, 15 Dec 2017 04:18:33 +0000 Subject: [PATCH] camlistore: 0.9 -> perkeep 20170505 camlistore has been renamed to perkeep --- pkgs/applications/misc/camlistore/default.nix | 35 ------------------- pkgs/applications/misc/perkeep/default.nix | 31 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 32 insertions(+), 36 deletions(-) delete mode 100644 pkgs/applications/misc/camlistore/default.nix create mode 100644 pkgs/applications/misc/perkeep/default.nix diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix deleted file mode 100644 index d90e8a6dba6..00000000000 --- a/pkgs/applications/misc/camlistore/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, go, fetchgit, git, buildGoPackage }: - -buildGoPackage rec { - name = "camlistore-${version}"; - version = "0.9"; - - src = fetchgit { - url = "https://github.com/camlistore/camlistore"; - rev = "refs/tags/${version}"; - sha256 = "1ypplr939ny9drsdngapa029fgak0wic8sbna588m79cbl17psya"; - leaveDotGit = true; - }; - - buildInputs = [ git ]; - - goPackagePath = ""; - buildPhase = '' - cd go/src/camlistore - go run make.go - ''; - - installPhase = '' - mkdir -p $bin/bin - rm bin/README - cp bin/* $bin/bin - ''; - - meta = with stdenv.lib; { - description = "A way of storing, syncing, sharing, modelling and backing up content"; - homepage = https://camlistore.org; - license = licenses.asl20; - maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix new file mode 100644 index 00000000000..3b64cf4aa6c --- /dev/null +++ b/pkgs/applications/misc/perkeep/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, go_1_8, fetchzip, git }: + +stdenv.mkDerivation rec { + name = "perkeep-${version}"; + version = "20170505"; + + src = fetchzip { + url = "https://perkeep.org/dl/monthly/camlistore-${version}-src.zip"; + sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa"; + }; + + buildInputs = [ git go_1_8 ]; + + goPackagePath = ""; + buildPhase = '' + go run make.go + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/* $out/bin + ''; + + meta = with stdenv.lib; { + description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; + homepage = https://perkeep.org; + license = licenses.asl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e7a56bd75d..59c083f4ebb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14121,7 +14121,7 @@ with pkgs; openjpeg = openjpeg_1; }; - camlistore = callPackage ../applications/misc/camlistore { }; + perkeep = callPackage ../applications/misc/perkeep { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { };