From 5ef5d96c0849bcb2760d7e3d2a7653c894a6e13a Mon Sep 17 00:00:00 2001 From: bb2020 Date: Mon, 26 Oct 2020 18:34:37 +0300 Subject: discrete-scroll: added myself as maintainer --- pkgs/os-specific/darwin/discrete-scroll/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/darwin/discrete-scroll/default.nix b/pkgs/os-specific/darwin/discrete-scroll/default.nix index e72402b77933..f38bf8d81322 100644 --- a/pkgs/os-specific/darwin/discrete-scroll/default.nix +++ b/pkgs/os-specific/darwin/discrete-scroll/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/emreyolcu/discrete-scroll"; platforms = platforms.darwin; license = licenses.mit; + maintainers = with lib.maintainers; [ bb2020 ]; }; } -- cgit v1.2.3 From 661f6bf2c95ad46c38af07526df8272456069e30 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 31 Oct 2020 04:20:00 +0000 Subject: lxc: 4.0.4 -> 4.0.5 --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 21c1eede9d7a..ade4299eaa7a 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "15frszz5am9bnr8vh1zpg89x0xigcfm19jax0z16cazd42xahr9w"; + sha256 = "1976l9308rx1ria1gazasypk5rmmf5jiqdh54dfrws5bslbdcb5g"; }; nativeBuildInputs = [ -- cgit v1.2.3 From a70df2c2ccf5317f1ecbf5f1716364947b5b96b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 23:18:01 +0000 Subject: fnotifystat: 0.02.06 -> 0.02.07 --- pkgs/os-specific/linux/fnotifystat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index f01c96259a80..baa92decd9fc 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "fnotifystat"; - version = "0.02.06"; + version = "0.02.07"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "1mr2qzh8r8qq7haz4qgci2k5lcrcy493fm0m3ri40a81vaajfniy"; + sha256 = "0ipfg2gymbgx7bqlx1sq5p2y89k5j18iqnb0wa27n5s3kh9sh8w0"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' -- cgit v1.2.3 From a27100c77bdb7cebe6a6745fc8ce36418f96cda5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Oct 2020 18:56:08 +0000 Subject: fwts: 20.08.00 -> 20.09.00 --- pkgs/os-specific/linux/fwts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 5de0eea0beac..58d4bdbae855 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "20.08.00"; + version = "20.09.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "098vxj5sd2nm88jmj6cxzcvid8w81m8fxdz881iki0pi7ysixa5q"; + sha256 = "1vzzlb7xdrk8rhi27jdw9baskild4dmk7g5d0hhfh6z3fx4lfhgk"; stripRoot = false; }; -- cgit v1.2.3 From 613adb0e8809c51e02e6361c2e88068b6ec079bb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 1 Nov 2020 14:05:38 -0800 Subject: kernel/linuxManualConfig: add variant metadata --- pkgs/os-specific/linux/kernel/manual-config.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 7a91705b617c..961bdab12b58 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -34,6 +34,13 @@ in { randstructSeed ? "", # Use defaultMeta // extraMeta extraMeta ? {}, + + # for module compatibility + isXen ? features.xen_dom0 or false, + isZen ? false, + isLibre ? false, + isHardened ? false, + # Whether to utilize the controversial import-from-derivation feature to parse the config allowImportFromDerivation ? false, # ignored @@ -86,6 +93,9 @@ let passthru = { inherit version modDirVersion config kernelPatches configfile moduleBuildDependencies stdenv; + inherit isXen isZen isHardened isLibre; + kernelOlder = stdenv.lib.versionOlder version; + kernelAtLeast = stdenv.lib.versionAtLeast version; }; inherit src; -- cgit v1.2.3 From c6afa8820b528cec7e889e462cbcab84c0313b41 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 1 Nov 2020 14:08:37 -0800 Subject: anbox: kernel.features can be null --- pkgs/os-specific/linux/anbox/kmod.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix index 6eb74ca25f6b..896beaf3056e 100644 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { homepage = "https://github.com/anbox/anbox-modules"; license = licenses.gpl2; platforms = platforms.linux; - broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity); + broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity or false); maintainers = with maintainers; [ edwtjo ]; }; -- cgit v1.2.3 From 7c1ff55c77d7432a21aea1577244b7c5c3e0cca9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Oct 2020 17:25:51 +0000 Subject: libfabric: 1.11.0 -> 1.11.1 --- pkgs/os-specific/linux/libfabric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix index 52de79e1f2df..1911391c935c 100644 --- a/pkgs/os-specific/linux/libfabric/default.nix +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.11.0"; + version = "1.11.1"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "1wgn6gsiy64rb76i46dsqlvp687lwqzxwg5lgj1y5y7lyqbq96wp"; + sha256 = "17qq96mlfhbkbmsvbazhxzkjnh6x37xlh3r0ngp0rfqbl05z2pcr"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] ; -- cgit v1.2.3 From 5e4b485d865033cfbaeb98716588f8499f752fc3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Nov 2020 19:42:21 +0000 Subject: libratbag: 0.14 -> 0.15 --- pkgs/os-specific/linux/libratbag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index 48ee5d16c5c0..e9f090255f92 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libratbag"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "libratbag"; repo = "libratbag"; rev = "v${version}"; - sha256 = "1fpwp2sj8mf98bqasq2h8qwgprxi7k3iw33gcfid3d1lbyiacw0x"; + sha256 = "0z6ps5aqwjmbdvahs80fh9cdgcvp4q4w3kfycmzv4kzgzihjki7b"; }; nativeBuildInputs = [ -- cgit v1.2.3