diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-22 17:51:01 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-22 17:51:01 +0100 |
| commit | 71f4ba29a3161cec4dc95d6c80863f55ff25f777 (patch) | |
| tree | 67774520442ab886120a8fd3b00dc52ea2455e8e /pkgs/os-specific | |
| parent | 821c0844d499658666901401f2ae088b85cc2e9a (diff) | |
| parent | e2b96562056ed59bd84c797f31c8decf60d2f5d3 (diff) | |
| download | nixlib-71f4ba29a3161cec4dc95d6c80863f55ff25f777.tar nixlib-71f4ba29a3161cec4dc95d6c80863f55ff25f777.tar.gz nixlib-71f4ba29a3161cec4dc95d6c80863f55ff25f777.tar.bz2 nixlib-71f4ba29a3161cec4dc95d6c80863f55ff25f777.tar.lz nixlib-71f4ba29a3161cec4dc95d6c80863f55ff25f777.tar.xz nixlib-71f4ba29a3161cec4dc95d6c80863f55ff25f777.tar.zst nixlib-71f4ba29a3161cec4dc95d6c80863f55ff25f777.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
Diffstat (limited to 'pkgs/os-specific')
4 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 4fa0c0e3e47f..c9473bca06d4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, fetchzip, pkgs, fetchurlBoot }: +{ stdenv, buildPackages, fetchurl, fetchzip, pkgs }: let # This attrset can in theory be computed automatically, but for that to work nicely we need @@ -141,7 +141,7 @@ let # in an infinite recursion without this. It's not clear why this # worked fine when not cross-compiling fetch = if name == "libiconv" - then fetchurlBoot + then stdenv.fetchurlBoot else fetchurl; in fetch { url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz"; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 73bea1c7da69..4b2877250821 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -32,14 +32,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.29.3"; + name = "busybox-1.30.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p"; + sha256 = "1p7vbnwj60q6zkzrzq3pa8ybb7mviv2aa5a8g7s4hh6kvfj0879x"; }; hardeningDisable = [ "format" "pie" ] diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e8126c23d3d1..61dbf2393bb1 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -592,6 +592,8 @@ let BLK_DEV_INTEGRITY = yes; + BLK_SED_OPAL = whenAtLeast "4.14" yes; + BSD_PROCESS_ACCT_V3 = yes; BT_HCIUART_BCSP = option yes; diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index f6f6c10112a7..9490bc911819 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "mwprocapture-1.2.${version}-${kernel.version}"; - version = "3950"; + version = "4054"; src = fetchurl { url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz"; - sha256 = "1im3k533r6c0dx08h9wjfbhadzk7zawrxxaz7v94c92m3q133ys6"; + sha256 = "0ylx75jcwlqds8w6lm11nxdlzxvy7xlz4rka2k5d6gmqa5fv19c2"; }; nativeBuildInputs = [ kernel.moduleBuildDependencies ]; |