diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-18 17:48:37 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-18 17:48:37 -0400 |
| commit | 5ccb99e372e0b811c330788fdc863937db020079 (patch) | |
| tree | c09b9db67eb14b7adb38580e6972a142c032c636 /pkgs/os-specific | |
| parent | e1a538c0da9107c67dabb5b649b21d575fa1d812 (diff) | |
| parent | 974fa94fd81204645150f03543288ddb481a8b67 (diff) | |
| download | nixlib-5ccb99e372e0b811c330788fdc863937db020079.tar nixlib-5ccb99e372e0b811c330788fdc863937db020079.tar.gz nixlib-5ccb99e372e0b811c330788fdc863937db020079.tar.bz2 nixlib-5ccb99e372e0b811c330788fdc863937db020079.tar.lz nixlib-5ccb99e372e0b811c330788fdc863937db020079.tar.xz nixlib-5ccb99e372e0b811c330788fdc863937db020079.tar.zst nixlib-5ccb99e372e0b811c330788fdc863937db020079.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/firejail/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/lsscsi/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/wireguard/default.nix | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 1c7ebce9f877..9f2374e75a88 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.52"; + version="0.9.54"; name="${baseName}-${version}"; - hash="0w8l8z4j7iph8fp7rchhnfsrik3f00f9v5xr191fp38fphzcj56s"; - url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.52.tar.xz"; - sha256="0w8l8z4j7iph8fp7rchhnfsrik3f00f9v5xr191fp38fphzcj56s"; + hash="0mkpqlhi1vxiwd1pmlsk02vpydy1gj61k1gi3zlz6qw84xa6i6ff"; + url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.54.tar.xz"; + sha256="0mkpqlhi1vxiwd1pmlsk02vpydy1gj61k1gi3zlz6qw84xa6i6ff"; }; buildInputs = [ which diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index 084a7e7c9a3b..d250d658282f 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "lsscsi-0.28"; + name = "lsscsi-0.29"; src = fetchurl { - url = "http://sg.danny.cz/scsi/lsscsi-0.28.tgz"; - sha256 = "0l6xz8545lnfd9f4z974ar1pbzfdkr6c8r56zjrcaazl3ad00p82"; + url = "http://sg.danny.cz/scsi/lsscsi-0.29.tgz"; + sha256 = "0538fjgxky03yn7mzyslkyi2af3yy5llsnjjcgjx73x08wd6hv5n"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 6e3e444240ac..c5daaabd5be8 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20180420"; + version = "0.0.20180514"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "05nsn5pkzvkfsc8z0mm4fdb1znklpmb00v608j8gxlz8z6nd535m"; + sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8"; }; meta = with stdenv.lib; { |