diff options
author | Orivej Desh <orivej@gmx.fr> | 2018-06-01 17:44:35 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2018-06-01 17:44:35 +0000 |
commit | 4b2735fd9fe26efb885e4dd53181237ddf9c2140 (patch) | |
tree | 44638c82dfd627d17d5b032f9c4f04975744d829 /pkgs/os-specific/linux | |
parent | fd9cfc4db512f41612727a4a4fe0303fe8f67bef (diff) | |
parent | bc069622dde963680f3e71c24f96a6fd32ed412e (diff) | |
download | nixpkgs-4b2735fd9fe26efb885e4dd53181237ddf9c2140.tar nixpkgs-4b2735fd9fe26efb885e4dd53181237ddf9c2140.tar.gz nixpkgs-4b2735fd9fe26efb885e4dd53181237ddf9c2140.tar.bz2 nixpkgs-4b2735fd9fe26efb885e4dd53181237ddf9c2140.tar.lz nixpkgs-4b2735fd9fe26efb885e4dd53181237ddf9c2140.tar.xz nixpkgs-4b2735fd9fe26efb885e4dd53181237ddf9c2140.tar.zst nixpkgs-4b2735fd9fe26efb885e4dd53181237ddf9c2140.zip |
Merge branch 'master' into staging
* master: (153 commits) coqPackages.contribs.aac-tactics: enable for Coq 8.7 and 8.8 (#41351) haskell.packages.ghcjs.terminfo: Bump version (#41337) nixos/mpd: allow services.mpd.dbFile to be null prometheus-snmp-exporter: 0.9.0 -> 0.11.0 (#41363) tdesktopPackages.preview: 1.2.24 -> 1.3.0 signal-desktop: Refactor the package description rrootage: init at 0.23a bulletml: init at 0.0.6 signal-desktop: Fix a possible crash when saving an attachment linux_rpi: More downstream device tree name fixups nixos/sd-image-raspberrypi: Support Raspberry Pi Zero U-Boot: Add ubootRaspberryPiZero variant U-Boot: 2018.03 -> 2018.05 linux_rpi: 1.20171029 -> 1.20180417 raspberrypifw: 1.20180328 -> 1.20180417 scite: 3.7.5 -> 4.0.5 (#41345) neo4j: 3.3.4 -> 3.4.0 (#41338) bat: 0.3.0 -> 0.4.1 (#41348) perlPackages.Git: init at 0.42 nodePackages_8_x.pnpm: wrap nodejs.passthru.python ...
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-rpi.nix | 27 | ||||
-rw-r--r-- | pkgs/os-specific/linux/libselinux/default.nix | 7 | ||||
-rw-r--r-- | pkgs/os-specific/linux/musl/fts-setup-hook.sh | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/musl/fts.nix | 19 | ||||
-rw-r--r-- | pkgs/os-specific/linux/musl/getconf.nix | 19 | ||||
-rw-r--r-- | pkgs/os-specific/linux/musl/getent.nix | 18 |
11 files changed, 31 insertions, 84 deletions
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index d00f1b14837..344d224df94 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "raspberrypi-firmware-${version}"; - version = "1.20180328"; + version = "1.20180417"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "19h4lv11idy268pyrq21c5gsff77d5xr9xjkpmzfpcq34gjh3x21"; + sha256 = "17mnnhni0wgdnc3mw60nfhcj9v6p5dwcqkwnbpvzczab3r2hziji"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 2b44ff51ad0..249a1ea5cef 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -12,6 +12,9 @@ , # The kernel version. version +, # Allows overriding the default defconfig + defconfig ? null + , # Overrides to the kernel config. extraConfig ? "" @@ -85,7 +88,7 @@ let platformName = hostPlatform.platform.name; # e.g. "defconfig" - kernelBaseConfig = hostPlatform.platform.kernelBaseConfig; + kernelBaseConfig = if defconfig != null then defconfig else hostPlatform.platform.kernelBaseConfig; # e.g. "bzImage" kernelTarget = hostPlatform.platform.kernelTarget; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index a7277d67968..d7bcd411764 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.46"; + version = "4.14.47"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0cpnfsxf2ici3yfn1bxix6219fri2s3ld19hpf00z9im8x91px4h"; + sha256 = "06c8kl9f0s5qmqh9l16y1q7r44ld56kd0a00722c3aivddm3nav7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 1f9b52c8db7..e06be4838ee 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.134"; + version = "4.4.135"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14gvkpdm3wbdfifnkrlk8b3i2isb439prqrzzlvjh88h582x4y20"; + sha256 = "1p41fz1jhcrzcmvhbl8di1660bv0w2wpcmi4hfgksdjfh84b1k03"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 8d4094075a4..d69717b15fe 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.104"; + version = "4.9.105"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "13f30b7z9sp9h1kwjahla194k7ji46z3pr706caapn71npn55abv"; + sha256 = "1i3dv7lvh7b08943iw45j0x99878wia83fribbgxn7xcwcld51fh"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index a96a910c68c..d869ea09036 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: let - modDirVersion = "4.9.59"; - tag = "1.20171029"; + modDirVersion = "4.14.34"; + tag = "1.20180417"; in stdenv.lib.overrideDerivation (buildLinux (args // rec { version = "${modDirVersion}-${tag}"; @@ -12,9 +12,14 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "19lb1gxz21x1d5zdznzqfq60kxg7iqmyl6l0mb9qg2vrl8fcgnxk"; + sha256 = "1xgisvmcq50lpnd4rpqhaw52399n0rx2n8mp6k0bf8qm1g3vnza2"; }; + defconfig = { + "armv6l-linux" = "bcmrpi_defconfig"; + "armv7l-linux" = "bcm2709_defconfig"; + }.${stdenv.system} or (throw "linux_rpi not supported on '${stdenv.system}'"); + features = { efiBootStub = false; } // (args.features or {}); @@ -27,16 +32,15 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec { ''; postFixup = '' - # Make copies of the DTBs so that U-Boot finds them, as it is looking for the upstream names. - # This is ugly as heck. + # Make copies of the DTBs named after the upstream names so that U-Boot finds them. + # This is ugly as heck, but I don't know a better solution so far. + rm $out/dtbs/bcm283*.dtb copyDTB() { - if [ -f "$out/dtbs/$1" ]; then - cp -v "$out/dtbs/$1" "$out/dtbs/$2" - fi + cp -v "$out/dtbs/$1" "$out/dtbs/$2" } - # I am not sure if all of these are correct... - copyDTB bcm2708-rpi-0-w.dts bcm2835-rpi-zero.dtb + copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero.dtb + copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero-w.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb @@ -46,6 +50,7 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec { copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb - # bcm2710-rpi-cm3.dts is yet unknown. + copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb + copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb ''; }) diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 59d5db52ac6..a172e45e7fa 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pcre, pkgconfig, libsepol , enablePython ? true, swig ? null, python ? null -, musl-fts +, fts }: assert enablePython -> swig != null && python != null; @@ -18,9 +18,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsepol pcre ] - ++ optionals enablePython [ swig python ] - ++ optional stdenv.hostPlatform.isMusl musl-fts; + buildInputs = [ libsepol pcre fts ] + ++ optionals enablePython [ swig python ]; # drop fortify here since package uses it by default, leading to compile error: # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] diff --git a/pkgs/os-specific/linux/musl/fts-setup-hook.sh b/pkgs/os-specific/linux/musl/fts-setup-hook.sh deleted file mode 100644 index 5cf8c753aec..00000000000 --- a/pkgs/os-specific/linux/musl/fts-setup-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -export NIX_${role_pre}LDFLAGS+=" -lfts" diff --git a/pkgs/os-specific/linux/musl/fts.nix b/pkgs/os-specific/linux/musl/fts.nix deleted file mode 100644 index 24d25de3a2d..00000000000 --- a/pkgs/os-specific/linux/musl/fts.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: - -stdenv.mkDerivation rec { - name = "musl-fts-${version}"; - version = "2017-01-13"; - src = fetchFromGitHub { - owner = "pullmoll"; - repo = "musl-fts"; - rev = "0bde52df588e8969879a2cae51c3a4774ec62472"; - sha256 = "1q8cpzisziysrs08b89wj0rm4p6dsyl177cclpfa0f7spjm3jg03"; - }; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - setupHooks = [ - ../../../build-support/setup-hooks/role.bash - ./fts-setup-hook.sh - ]; -} diff --git a/pkgs/os-specific/linux/musl/getconf.nix b/pkgs/os-specific/linux/musl/getconf.nix deleted file mode 100644 index dbfaca296bf..00000000000 --- a/pkgs/os-specific/linux/musl/getconf.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "musl-getconf"; - src = fetchurl { - url = "https://raw.githubusercontent.com/alpinelinux/aports/48b16204aeeda5bc1f87e49c6b8e23d9abb07c73/main/musl/getconf.c"; - sha256 = "0z14ml5343p5gapxw9fnbn2r72r7v2gk8662iifjrblh6sxhqzfq"; - }; - - unpackPhase = ":"; - - buildPhase = ''$CC $src -o getconf''; - installPhase = '' - mkdir -p $out/bin - cp getconf $out/bin/ - ''; -} - - diff --git a/pkgs/os-specific/linux/musl/getent.nix b/pkgs/os-specific/linux/musl/getent.nix deleted file mode 100644 index 6eed17a76b0..00000000000 --- a/pkgs/os-specific/linux/musl/getent.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "musl-getent"; - src = fetchurl { - url = "https://raw.githubusercontent.com/alpinelinux/aports/89a718d88ec7466e721f3bbe9ede5ffe58061d78/main/musl/getent.c"; - sha256 = "0b4jqnsmv1hjgcz7db3vd61k682aphl59c3yhwya2q7mkc6g48xk"; - }; - - unpackPhase = ":"; - - buildPhase = ''$CC $src -o getent''; - installPhase = '' - mkdir -p $out/bin - cp getent $out/bin/ - ''; -} - |