diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-14 18:01:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-14 18:01:13 +0000 |
| commit | 597fe78e70a7d58abac1f6c892e3ce78207680d1 (patch) | |
| tree | 4caf00c56861c6f6e42350b50ea53dc53602c040 /pkgs/os-specific | |
| parent | e88c8f6c53e8b5a96ac58baf365bf9141681cd44 (diff) | |
| parent | a82e6b5dae5b338568dec9cbe102a7be6d52e544 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/jool/cli.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/jool/source.nix | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 4c18f478798ee..dbcf9522e723c 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation { src = sourceAttrs.src; + outputs = [ + "out" + "man" + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libnl iptables ]; diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index 87e36fe5a9eb2..600dd8a33a4a8 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "4.1.7"; + version = "4.1.8"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; rev = "v${version}"; - sha256 = "08z23mi6xkr6zzp0hzh1cppvl2y0177s0lnpxqbpy8jiii5fxw8f"; + hash = "sha256-b+1EM172NRnnTcbJOwBQfytIRuIr8zZBlKBBV/e7Ttg="; }; } |