From a04e3c7615f37cad555ca79aa9030abbce44c57a Mon Sep 17 00:00:00 2001 From: Nicolas Pouillard Date: Thu, 21 Jan 2016 22:43:46 +0100 Subject: [PATCH] interlock: init at 2016.01.14 Also add textsecure on which it depends: textsecure: init at 505e129c42fc4c5cb2d105520cef7c04fa3a6b64 --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/go-packages.nix | 34 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c283e4acb10..b6f601d5ebc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -879,6 +879,8 @@ let heatseeker = callPackage ../tools/misc/heatseeker { }; + interlock = goPackages.interlock.bin // { outputs = [ "bin" ]; }; + mathics = pythonPackages.mathics; mcrl = callPackage ../tools/misc/mcrl { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index f7a2d8904f3b..83c7564392f5 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -3599,4 +3599,38 @@ let xargs -d '\n' sed -i -e s,github.com/ericchiang/pup/Godeps/_workspace/src/,,g ''; }; + + textsecure = buildFromGitHub rec { + rev = "505e129c42fc4c5cb2d105520cef7c04fa3a6b64"; + owner = "janimo"; + repo = "textsecure"; + sha256 = "0sdcqd89dlic0bllb6mjliz4x54rxnm1r3xqd5qdp936n7xs3mc6"; + propagatedBuildInputs = [ crypto protobuf ed25519 yaml-v2 logrus ]; + disabled = isGo14; + }; + + interlock = buildFromGitHub rec { + version = "2016.01.14"; + rev = "v${version}"; + owner = "inversepath"; + repo = "interlock"; + sha256 = "0wabx6vqdxh2aprsm2rd9mh71q7c2xm6xk9a6r1bn53r9dh5wrsb"; + buildInputs = [ crypto textsecure ]; + nativeBuildInputs = [ pkgs.sudo ]; + buildFlags = [ "-tags textsecure" ]; + subPackages = [ "./cmd/interlock" ]; + postPatch = '' + grep -lr '/s\?bin/' | xargs sed -i \ + -e 's|/bin/mount|${pkgs.utillinux}/bin/mount|' \ + -e 's|/bin/umount|${pkgs.utillinux}/bin/umount|' \ + -e 's|/bin/cp|${pkgs.coreutils}/bin/cp|' \ + -e 's|/bin/mv|${pkgs.coreutils}/bin/mv|' \ + -e 's|/bin/chown|${pkgs.coreutils}/bin/chown|' \ + -e 's|/bin/date|${pkgs.coreutils}/bin/date|' \ + -e 's|/sbin/poweroff|${pkgs.systemd}/sbin/poweroff|' \ + -e 's|/usr/bin/sudo|/var/setuid-wrappers/sudo|' \ + -e 's|/sbin/cryptsetup|${pkgs.cryptsetup}/bin/cryptsetup|' + ''; + disabled = isGo14; + }; }; in self