From 884e6a7b9fbea0e776e199ed4c11d36f2f3dedb8 Mon Sep 17 00:00:00 2001 From: Christian Kögler Date: Mon, 23 Apr 2018 23:54:04 +0200 Subject: tbs: updated to kernel-4.14 * updated meta data * fix concurrent names for fetchFromGitHub derivations --- pkgs/os-specific/linux/tbs/default.nix | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index e4b954d4dbf5..db20a7ab8211 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages }: +{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages, libelf }: let - media = fetchFromGitHub { + + media = fetchFromGitHub rec { + name = repo; owner = "tbsdtv"; repo = "linux_media"; - rev = "14ebbec91f2cd0423aaf859fc6e6d5d986397cd4"; - sha256 = "1cmqj3kby8sxfcpvslbxywr95529vjxzbn800fdp35lka1fv962h"; + rev = "efe31531b77efd3a4c94516504a5823d31cdc776"; + sha256 = "1533qi3sb91v00289hl5zaj4l35r2sf9fqc6z5ky1vbb7byxgnlr"; }; - build = fetchFromGitHub { + + build = fetchFromGitHub rec { + name = repo; owner = "tbsdtv"; repo = "media_build"; - rev = "c340e29a4047e43f7ea7ebf19e1e28c1f2112d05"; - sha256 = "0hfn1j9qk8lh30z3ywj22qky480nsf8z2iag2bqhrhy4375vjlbl"; + rev = "a0d62eba4d429e0e9d2c2f910fb203e817cac84b"; + sha256 = "1329s7w9xlqjqwkpaqsd6b5dmzhm97jw0c7c7zzmmbdkl289i4i4"; }; + in stdenv.mkDerivation { - name = "tbs-2017-11-05-${kernel.version}"; + name = "tbs-2018.04.18-${kernel.version}"; srcs = [ media build ]; sourceRoot = "${build.name}"; @@ -39,10 +44,13 @@ in stdenv.mkDerivation { installFlags = [ "DESTDIR=$(out)" ]; hardeningDisable = [ "pic" "format" ]; - nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ]; - meta = with stdenv.lib; { + nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ] + ++ lib.optional (lib.versionAtLeast kernel.version "4.14") [ libelf ]; + + meta = with lib; { homepage = https://www.tbsdtv.com/; + description = "Linux driver for TBSDTV cards"; license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; priority = 20; -- cgit 1.4.1 From a050133e9f75010fc2fba37c4acfe98c264f6e4c Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 26 Apr 2018 19:39:03 +0900 Subject: linux-mptcp: enable advanced schedulers --- pkgs/os-specific/linux/kernel/linux-mptcp.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index c4bade2abeda..d486bd1d6d24 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -33,8 +33,7 @@ buildLinux (rec { DEFAULT_MPTCP_PM default # MPTCP scheduler selection. - # Disabled as the only non-default is the useless round-robin. - MPTCP_SCHED_ADVANCED n + MPTCP_SCHED_ADVANCED y DEFAULT_MPTCP_SCHED default # Smarter TCP congestion controllers -- cgit 1.4.1 From caed1877ebf7a84f16ac1eb6af641af155e47b5b Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 11 Apr 2018 20:51:39 +0200 Subject: cryptsetup-generator: add postFixup This makes cryptsetup-generator link correctly to the shared systemd library. --- pkgs/os-specific/linux/systemd/cryptsetup-generator.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index f69269347e37..5c6efb440133 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -13,6 +13,17 @@ stdenv.lib.overrideDerivation systemd (p: { ninja systemd-cryptsetup systemd-cryptsetup-generator ''; + # As ninja install is not used here, the rpath needs to be manually fixed. + # Otherwise the resulting binary doesn't properly link against systemd-shared.so + postFixup = '' + sharedLib=libsystemd-shared-${p.version}.so + for prog in `find $out -type f -executable`; do + (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( + patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog + ) || true + done + ''; + installPhase = '' mkdir -p $out/lib/systemd/ cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup -- cgit 1.4.1 From 9b99738c84dfc5a66ec4e9aee1a30afc580a3cb8 Mon Sep 17 00:00:00 2001 From: goibhniu Date: Wed, 2 May 2018 15:03:39 +0200 Subject: tbs: override the kernel dvb-core.ko and videodev.ko Otherwise the kernel versions of dvb-core.ko and videodev.ko get loaded instead of the versions from this package. --- pkgs/os-specific/linux/tbs/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index db20a7ab8211..291666c0b450 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -43,16 +43,21 @@ in stdenv.mkDerivation { buildFlags = [ "VER=${kernel.modDirVersion}" ]; installFlags = [ "DESTDIR=$(out)" ]; - hardeningDisable = [ "pic" "format" ]; + hardeningDisable = [ "all" ]; nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ] - ++ lib.optional (lib.versionAtLeast kernel.version "4.14") [ libelf ]; + ++ kernel.moduleBuildDependencies; + + postInstall = '' + xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/media/dvb-core/dvb-core.ko + xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/media/v4l2-core/videodev.ko + ''; meta = with lib; { homepage = https://www.tbsdtv.com/; description = "Linux driver for TBSDTV cards"; license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; - priority = 20; + priority = -1; }; } -- cgit 1.4.1 From bd7c16e9c3e392950b7e8d7b2574aac170ea735b Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Sun, 6 May 2018 21:10:24 +0300 Subject: iwd: 0.1 -> 0.2 --- pkgs/os-specific/linux/iwd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index a1c577d2bb57..792c7bcb0849 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -3,17 +3,17 @@ let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "0.4"; - sha256 = "0l203n1jnqa2mcifir8ydxhcvbiwlvk89ailm0lida83l9vdlwpv"; + rev = "0.5"; + sha256 = "0xw53bigh99nhacjb67qs1g145fwls7065l8vsrziwzpkyd5s6a8"; }; in stdenv.mkDerivation rec { name = "iwd-${version}"; - version = "0.1"; + version = "0.2"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "1f8c6xvcvqw8z78mskynd2fkghggcl7vfz8vxzvpx0fkqcprn5n0"; + sha256 = "0khc017s27n6y6c6wbqhmcghzggnagxbi8j36hl5g73y6s44vx42"; }; nativeBuildInputs = [ -- cgit 1.4.1 From fe89c1be0308390918f0b4efd384ee9be59d5c3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 03:01:21 -0700 Subject: hwdata: 0.311 -> 0.312 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/hwdata/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.312 with grep in /nix/store/sfzsz7mns2n1kj0s9wdhv38s5xm0a1c3-hwdata-0.312 - directory tree listing: https://gist.github.com/7c5e5f17dc28268564e6ebf71204803d --- pkgs/os-specific/linux/hwdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 15b3903ddd1a..070ddfd77789 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.311"; + version = "0.312"; src = fetchurl { - url = "https://github.com/vcrhonek/hwdata/archive/v0.311.tar.gz"; - sha256 = "159av9wvl3biryxd5pgqcwz6wkdaa0ydmcysmzznx939mfv7w18z"; + url = "https://github.com/vcrhonek/hwdata/archive/v0.312.tar.gz"; + sha256 = "04dbxfn40b8vyw49qpkslv20akbqm5hwl3cndmqacp6cik1l0gai"; }; preConfigure = "patchShebangs ./configure"; -- cgit 1.4.1 From 1e01a6ef38215dd4082bb4035b3e89c4dc94a9cc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 May 2018 05:20:59 -0700 Subject: alfred: 2018.0 -> 2018.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alfred/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2018.1 with grep in /nix/store/2fj5i6zd4mp4asxchsig266lqz8acliv-alfred-2018.1 - directory tree listing: https://gist.github.com/64f566e02d8018fe290dc3db29fd7c7f --- pkgs/os-specific/linux/batman-adv/alfred.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 9b7484932ebd..90489e12d690 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2018.0"; + ver = "2018.1"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0mzjgjkmgdrrqa6fbpii9q1xqvg3kvwgq2k2kpdf0vy4xxnypky7"; + sha256 = "0xkd842yp227jzfybjq8c5s7y5c7amm1f5ai80k8wyjwysnad3w0"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From 3510b983c41196fce90729289c8c300ada1ccaea Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 8 May 2018 10:01:48 -0400 Subject: linux: 4.17-rc3 -> 4.17-rc4 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index d02ab4157191..922256703307 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.17-rc3"; - modDirVersion = "4.17.0-rc3"; + version = "4.17-rc4"; + modDirVersion = "4.17.0-rc4"; extraMeta.branch = "4.17"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1divgjzmpl98b5j416vhkq53li0y9v5vvdwbgwpr2xznspzbkygq"; + sha256 = "1y34hpzgxblwqslhsfsmzmpv9f3s936r93wgn4kmhkcwsm0in292"; }; # Should the testing kernels ever be built on Hydra? -- cgit 1.4.1