Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: af041b34a29d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d703ec3e935
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 12, 2018

  1. spideroak: 6.1.9 -> 7.0.1

    @lloydhazlett
    lloydhazlett committed Mar 12, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    shlevy Shea Levy
    GPG key ID: 5C0BD6957D86FE27
    Verified
    Learn about vigilant mode
    Copy the full SHA
    47c7ad1 View commit details

  2. Merge pull request #36844 from lloydhazlett/spideroak-7.0.1 

    spideroak: 6.1.9 -> 7.0.1
    @fpletz
    fpletz authored Mar 12, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0d703ec View commit details
Showing with 7 additions and 7 deletions.
  1. +7 −7 pkgs/applications/networking/spideroak/default.nix
14 changes: 7 additions & 7 deletions pkgs/applications/networking/spideroak/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,31 +4,31 @@
}:

let
arch = if stdenv.system == "x86_64-linux" then "x86_64"
else if stdenv.system == "i686-linux" then "i386"
arch = if stdenv.system == "x86_64-linux" then "x64"
else if stdenv.system == "i686-linux" then "x86"
else throw "Spideroak client for: ${stdenv.system} not supported!";

interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2"
else if stdenv.system == "i686-linux" then "ld-linux.so.2"
else throw "Spideroak client for: ${stdenv.system} not supported!";

sha256 = if stdenv.system == "x86_64-linux" then "0k87rn4aj0v79rz9jvwspnwzmh031ih0y74ra88nc8kl8j6b6gjm"
else if stdenv.system == "i686-linux" then "1wbxfikj8f7rx26asswqrfp9vpk8w5941s21y1pnaff2gcac8m3z"
sha256 = if stdenv.system == "x86_64-linux" then "993e01986e3657d6fa979b8d0f45ac25b8223c18f75555016a9f92e651e91b1f"
else if stdenv.system == "i686-linux" then "d12c09c3a01bfa48bdecc8763bbf2c7f10b71cea5bcecc177dad031ba79bc83d"
else throw "Spideroak client for: ${stdenv.system} not supported!";

ldpath = stdenv.lib.makeLibraryPath [
fontconfig freetype glib libICE libSM
libX11 libXext libXrender zlib
];

version = "6.1.9";
version = "7.0.1";

in stdenv.mkDerivation {
name = "spideroak-${version}";

src = fetchurl {
name = "spideroak-${version}-${arch}";
url = "https://spideroak.com/getbuild?platform=slackware&arch=${arch}&version=${version}";
name = "SpiderOakONE-${version}-slack_tar_${arch}.tgz";
url = "https://spideroak.com/release/spideroak/slack_tar_${arch}";
inherit sha256;
};