diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-30 19:51:33 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-30 19:51:33 +0100 |
| commit | c9171e5a4c3e61f9afa0e3da3755712d1da5d693 (patch) | |
| tree | 89b09dee818b612c9c52fb92d79b7169f1202006 /pkgs/data | |
| parent | e851d53ceaf2cd48d0757c385626dd2040db0f12 (diff) | |
| parent | 078fc69425787c9ceebfa003add3c1d80e49560c (diff) | |
| download | nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.gz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.bz2 nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.lz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.xz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.zst nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1430035
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/documentation/man-pages/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/wireless-regdb/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index f292ef4d52d9..0e6a0450bb47 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "4.12"; + version = "4.14"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "6f6d79d991fed04e16e7c7a15705304b0b9d51de772c51c57428555039fbe093"; + sha256 = "0wf9ymqxk1k5xwcl3n919p66a1aayif3x4cahj4w04y3k1wbhlih"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index c714dc6cf1b0..70f217f1b7e9 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "wireless-regdb-${version}"; - version = "2017.03.07"; + version = "2017.12.23"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz"; - sha256 = "1f9mcp78sdd4sci6v32vxfcl1rfjpv205jisz1p93kkfnaisy7ip"; + sha256 = "1faa394frq0126h2z28kp4dwknx6zqm5nar4552g7rwqvl2yclqf"; }; dontBuild = true; |