public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jool: 3.5.3 -> 3.5.4

Browse Source
This commit is contained in:
Franz Pletz 2017-08-01 00:31:12 +02:00
parent f3a54b014c
commit 9719e43494
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/jool/cli.nix
View File

@ -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 ];

6
pkgs/os-specific/linux/jool/default.nix
View File

@ -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 {

12
pkgs/os-specific/linux/jool/source.nix
View File

@ -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";
};
}