From 71b92ecfea0cb6ec11f37a113b4ee690a7331b48 Mon Sep 17 00:00:00 2001 From: Harrison Harnisch Date: Sat, 22 Oct 2016 18:37:17 +0000 Subject: [PATCH] Hyperterm: 0.7.6 -> (Hyper) 0.8.3 - rename Hyperterm to Hyper (as per their rebranding) - update to latest version --- .../misc/{hyperterm => hyper}/default.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) rename pkgs/applications/misc/{hyperterm => hyper}/default.nix (72%) diff --git a/pkgs/applications/misc/hyperterm/default.nix b/pkgs/applications/misc/hyper/default.nix similarity index 72% rename from pkgs/applications/misc/hyperterm/default.nix rename to pkgs/applications/misc/hyper/default.nix index 59cd9ac2696..310f8feb2fd 100644 --- a/pkgs/applications/misc/hyperterm/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -11,11 +11,11 @@ let ]; in stdenv.mkDerivation rec { - version = "0.7.6"; - name = "hyperterm-${version}"; + version = "0.8.3"; + name = "hyper-${version}"; src = fetchurl { - url = https://github.com/zeit/hyperterm/releases/download/v0.7.1/hyperterm-0.7.1.deb; - sha256 = "1xdwhmzlkg1ly1xgsbv99xk4x1g1x270vx1b12dvf10ck5x9v63a"; + url = "https://github.com/zeit/hyper/releases/download/${version}/hyper-${version}-amd64.deb"; + sha256 = "1683gc0fhifn89l9h67yz02pk1xz7p5l3qpiyddr9w21qr9h3lhq"; }; buildInputs = [ dpkg ]; unpackPhase = '' @@ -25,16 +25,16 @@ stdenv.mkDerivation rec { ''; installPhase = '' mkdir -p "$out/bin" - ln -s "$out/opt/HyperTerm/HyperTerm" "$out/bin/HyperTerm" mv opt "$out/" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/HyperTerm/HyperTerm" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" "$out/opt/HyperTerm/resources/app/node_modules/child_pty/build/Release/exechelper" + ln -s "$out/opt/Hyper/Hyper" "$out/bin/Hyper" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/Hyper" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" "$out/opt/Hyper/resources/app/node_modules/child_pty/build/Release/exechelper" mv usr/* "$out/" ''; dontPatchELF = true; meta = with lib; { description = "A terminal built on web technologies"; - homepage = https://hyperterm.org/; + homepage = https://hyper.is/; maintainers = with maintainers; [ puffnfresh ]; license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8a6c2e233e..8e530d3b90c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7788,7 +7788,7 @@ in }; libgumbo = callPackage ../development/libraries/libgumbo { }; - + libhangul = callPackage ../development/libraries/libhangul { }; libharu = callPackage ../development/libraries/libharu { }; @@ -13207,7 +13207,8 @@ in hydrogen = callPackage ../applications/audio/hydrogen { }; - hyperterm = callPackage ../applications/misc/hyperterm { inherit (gnome2) GConf; }; + hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; }; + hyperterm = self.hyper; slack = callPackage ../applications/networking/instant-messengers/slack { };