From 2457c2ab9a725ee319317b434ea2d3449f8c6e08 Mon Sep 17 00:00:00 2001 From: Átila Saraiva Date: Wed, 15 Jun 2022 11:57:30 -0300 Subject: linuxPackages.rtw88: 2022-05-08 to 2022-06-03 --- pkgs/os-specific/linux/rtw88/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index 06fd2786c7cfb..bbff4f6e4a714 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation { pname = "rtw88"; - version = "unstable-2022-05-08"; + version = "unstable-2022-06-03"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtw88"; - rev = "dbcc43c31a4576f90e1e468d3a85c2dfdb25ec42"; - hash = "sha256-IDHolspYtwjV5r5WArWl1g4zgKLvPd4ydKKH/aE5NSg="; + rev = "03da251c76ea1005b42625825c39181e12d75693"; + sha256 = "0l5ysp4x5wzrn48sfjv3rciqhq5ldcmk86b9x6j9775zjj7yw8hw"; }; nativeBuildInputs = kernel.moduleBuildDependencies; -- cgit 1.4.1 From d1daa6417e201747b25354a4cb10ee22f57d7a37 Mon Sep 17 00:00:00 2001 From: Mihai-Drosi Câju Date: Sat, 4 Jun 2022 18:58:02 +0300 Subject: waydroid: 1.2.0 -> 1.2.1 --- pkgs/os-specific/linux/waydroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index 1390077a60d14..0a0a4019e9839 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec { pname = "waydroid"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "03d87sh443kn0j2mpih1g909khkx3wgb04h605f9jhd0znskkbmw"; + sha256 = "sha256-Sf1rl8GCSTuneuYroGqsm9Aq2rBurpyswOrfCq2mWOs="; }; propagatedBuildInputs = with python3Packages; [ -- cgit 1.4.1 From 089d7e3941cb7baccfb3f1c9cd6ec8fd8f703d14 Mon Sep 17 00:00:00 2001 From: InternetUnexplorer Date: Thu, 16 Jun 2022 17:36:57 -0700 Subject: linux_zen: 5.18.1-zen1 -> 5.18.5-zen1 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 0e9a632ddb56d..504cb1267429c 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.18.1-zen1"; + modDirVersion = "5.18.5-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -20,7 +20,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; inherit rev; - sha256 = "sha256-LCLfLE85NifuskYl2dxLOJEsUNHLegF8ecYyU4xOCtY="; + sha256 = "sha256-q6a8Wyzs6GNQ39mV+q/9N6yo/kXS9ZH+QTfGka42gk4="; }; structuredExtraConfig = with lib.kernel; { -- cgit 1.4.1 From bce0ac2d35868933232196308e5d5425672dfbb9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 17 Jun 2022 14:46:32 -0400 Subject: linuxPackages.system76-io: 1.0.1 -> 1.0.2 --- pkgs/os-specific/linux/system76-io/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/system76-io/default.nix b/pkgs/os-specific/linux/system76-io/default.nix index ab8c422d2da36..54af222bc7d88 100644 --- a/pkgs/os-specific/linux/system76-io/default.nix +++ b/pkgs/os-specific/linux/system76-io/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, kernel, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, kernel }: let - version = "1.0.1"; - sha256 = "0qkgkkjy1isv6ws6hrcal75dxjz98rpnvqbm7agdcc6yv0c17wwh"; + version = "1.0.2"; + sha256 = "sha256-DWUjQmoojkzFv1p4Xyt0kOwwqQ216ocO5yR/ujhhMPA="; in stdenv.mkDerivation { name = "system76-io-module-${version}-${kernel.version}"; @@ -15,19 +15,6 @@ stdenv.mkDerivation { inherit sha256; }; - patches = [ - (fetchpatch { - name = "Fix_GCC_declaration-after-statement_error.patch"; - url = "https://patch-diff.githubusercontent.com/raw/pop-os/system76-io-dkms/pull/5.patch"; - sha256 = "sha256-G8SM5tdNbeLuwigmo1HKLN9o16WPpowLXxfM7Xi4aRI="; - }) - (fetchpatch { - name = "Fix_GCC_unused-function_error.patch"; - url = "https://patch-diff.githubusercontent.com/raw/pop-os/system76-io-dkms/pull/6.patch"; - sha256 = "sha256-vCXEzszmXa+wmI84oR8WduN4WnLTZA3M4GX+Jc4p/5o="; - }) - ]; - hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; -- cgit 1.4.1 From a6037ef47dd0945f066a2e12d59cda329fca133d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 15 Jun 2022 23:01:51 +0100 Subject: openiscsi: 2.1.4 -> 2.1.7 changelog: https://github.com/open-iscsi/open-iscsi/blob/master/Changelog --- pkgs/os-specific/linux/open-iscsi/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index a4f6565f0c708..ebeb3516f243d 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.4"; + version = "2.1.7"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; buildInputs = [ kmod open-isns.lib openssl systemd util-linux ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "sha256-HnvLLwxOnu7Oiige6A6zk9NmAI2ImcILp9eCfbdGiyI="; + sha256 = "sha256-R1ttHHxVSQ5TGtWVy4I9BAmEJfcRhKRD5jThoeddjUw="; }; DESTDIR = "$(out)"; @@ -23,8 +23,17 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's|/usr|/|' Makefile + + # Remove blanket -Werror. Fails for minor error on gcc-11. + substituteInPlace usr/Makefile --replace ' -Werror ' ' ' ''; + # avoid /usr/bin/install + makeFlags = [ + "INSTALL=install" + "SED=sed" + ]; + installFlags = [ "install" "install_systemd" -- cgit 1.4.1 From 6e73e6e66883bd9dbb22d0829881c4eeb72e48d0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 17 Jun 2022 19:44:04 -0300 Subject: tinyalsa: init at 2.0.0 --- pkgs/os-specific/linux/tinyalsa/default.nix | 37 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/os-specific/linux/tinyalsa/default.nix (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/tinyalsa/default.nix b/pkgs/os-specific/linux/tinyalsa/default.nix new file mode 100644 index 0000000000000..789bf5b523527 --- /dev/null +++ b/pkgs/os-specific/linux/tinyalsa/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "tinyalsa"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "tinyalsa"; + repo = "tinyalsa"; + rev = "v${version}"; + hash = "sha256-WFJbew6ApB9InKN1SyRkbVoFlBCFm5uYzazdtsaHM90="; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DTINYALSA_USES_PLUGINS=ON" + ]; + + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=stringop-truncation" + ]; + + meta = with lib; { + homepage = "https://github.com/tinyalsa/tinyalsa"; + description = "Tiny library to interface with ALSA in the Linux kernel"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dba7006d611ed..76d16b9519df5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22916,6 +22916,8 @@ with pkgs; alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { }; + tinyalsa = callPackage ../os-specific/linux/tinyalsa { }; + alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { }; alsa-lib = callPackage ../os-specific/linux/alsa-project/alsa-lib { }; alsa-oss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; -- cgit 1.4.1 From 8d07ad4db407536532e6d30936a20125e0eb5a9d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 17 Jun 2022 22:29:11 -0300 Subject: tinyalsa: 2.0.0 -> unstable-2022-06-05 --- pkgs/os-specific/linux/tinyalsa/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/tinyalsa/default.nix b/pkgs/os-specific/linux/tinyalsa/default.nix index 789bf5b523527..45d9191eea081 100644 --- a/pkgs/os-specific/linux/tinyalsa/default.nix +++ b/pkgs/os-specific/linux/tinyalsa/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tinyalsa"; - version = "2.0.0"; + version = "unstable-2022-06-05"; src = fetchFromGitHub { owner = "tinyalsa"; repo = "tinyalsa"; - rev = "v${version}"; - hash = "sha256-WFJbew6ApB9InKN1SyRkbVoFlBCFm5uYzazdtsaHM90="; + rev = "3d70d227e7dfd1be6f8f420a5aae164a2b4126e0"; + hash = "sha256-RHeF3VShy+LYFtJK+AEU7swIr5/rnpg2fdllnH9cFCk="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=stringop-truncation" + "-Wno-error=sign-compare" ]; meta = with lib; { -- cgit 1.4.1