diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-01 00:31:12 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-01 06:15:59 +0200 |
| commit | 9719e434946fb53dff1d0ffbbdc490b8af9e6964 (patch) | |
| tree | dcd0b19f40a0541dcf7fac0ea84d79d8d0d7018d /pkgs/os-specific/linux/jool | |
| parent | f3a54b014ce9cc3bbf2a65ab88291cbc3e3701b6 (diff) | |
| download | nixpkgs-9719e434946fb53dff1d0ffbbdc490b8af9e6964.tar nixpkgs-9719e434946fb53dff1d0ffbbdc490b8af9e6964.tar.gz nixpkgs-9719e434946fb53dff1d0ffbbdc490b8af9e6964.tar.bz2 nixpkgs-9719e434946fb53dff1d0ffbbdc490b8af9e6964.tar.lz nixpkgs-9719e434946fb53dff1d0ffbbdc490b8af9e6964.tar.xz nixpkgs-9719e434946fb53dff1d0ffbbdc490b8af9e6964.tar.zst nixpkgs-9719e434946fb53dff1d0ffbbdc490b8af9e6964.zip | |
jool: 3.5.3 -> 3.5.4
Diffstat (limited to 'pkgs/os-specific/linux/jool')
| -rw-r--r-- | pkgs/os-specific/linux/jool/cli.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/jool/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/jool/source.nix | 12 |
3 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index c8775eee48c..6b79045ac67 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchzip, autoreconfHook, pkgconfig, libnl }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libnl }: let - sourceAttrs = (import ./source.nix) { inherit fetchzip; }; + sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = sourceAttrs.src; - sourceRoot = "Jool-${sourceAttrs.version}.zip/usr"; + sourceRoot = "Jool-v${sourceAttrs.version}-src/usr"; buildInputs = [ autoreconfHook pkgconfig libnl ]; diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 824bc3f9a18..37dd4d727ec 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchzip, kernel }: +{ stdenv, fetchFromGitHub, kernel }: -assert stdenv.lib.versionOlder kernel.version "4.11"; +assert stdenv.lib.versionOlder kernel.version "4.13"; let - sourceAttrs = (import ./source.nix) { inherit fetchzip; }; + sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; in stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index 2de2aeeff8f..ace103a92f9 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,9 +1,11 @@ -{ fetchzip }: +{ fetchFromGitHub }: rec { - version = "3.5.3"; - src = fetchzip { - url = "https://github.com/NICMx/releases/raw/master/Jool/Jool-${version}.zip"; - sha256 = "1dh8qcb3grjpsk7j5d8p5dncrh4fljkrfd9b8sxd2c3kirczckmp"; + version = "3.5.4"; + src = fetchFromGitHub { + owner = "NICMx"; + repo = "Jool"; + rev = "v${version}"; + sha256 = "09b9zcxgmy59jb778lkdyslx777bpsl216kkivw0zwfwsgd4pyz5"; }; } |