diff options
Diffstat (limited to 'pkgs/os-specific')
94 files changed, 800 insertions, 542 deletions
diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index 3a53916a46d..e7252ab35e6 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -2,7 +2,7 @@ , makeScopeWithSplicing, generateSplicesForMkScope , buildPackages , bsdSetupHook, makeSetupHook -, fetchgit, fetchurl, coreutils, groff, mandoc, byacc, flex, which, m4, gawk, substituteAll, runtimeShell +, fetchgit, fetchzip, coreutils, groff, mandoc, byacc, flex, which, m4, gawk, substituteAll, runtimeShell , zlib, expat, libmd , runCommand, writeShellScript, writeText, symlinkJoin }: @@ -75,6 +75,11 @@ in makeScopeWithSplicing in { inherit freebsdSrc; + ports = fetchzip { + url = "https://cgit.freebsd.org/ports/snapshot/ports-dde3b2b456c3a4bdd217d0bf3684231cc3724a0a.tar.gz"; + sha256 = "BpHqJfnGOeTE7tkFJBx0Wk8ryalmf4KNTit/Coh026E="; + }; + # Why do we have splicing and yet do `nativeBuildInputs = with self; ...`? # See note in ../netbsd/default.nix. @@ -388,6 +393,12 @@ in makeScopeWithSplicing outputs = [ "out" "man" "test" ]; }; + sed = mkDerivation { + path = "usr.bin/sed"; + TESTSRC = "${freebsdSrc}/contrib/netbsd-tests"; + MK_TESTS = "no"; + }; + # Don't add this to nativeBuildInputs directly. Use statHook instead. stat = mkDerivation { path = "usr.bin/stat"; diff --git a/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix b/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix new file mode 100644 index 00000000000..3c3dcb6d5d6 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix @@ -0,0 +1,64 @@ +{ lib, stdenv, linuxHeaders, freebsd, runCommandCC, buildPackages }: + +stdenv.mkDerivation { + pname = "evdev-proto"; + inherit (linuxHeaders) version; + + src = freebsd.ports; + + sourceRoot = "source/devel/evdev-proto"; + + useTempPrefix = true; + + nativeBuildInputs = [ freebsd.makeMinimal ]; + + ARCH = freebsd.makeMinimal.MACHINE_ARCH; + OPSYS = "FreeBSD"; + _OSRELEASE = "${lib.versions.majorMinor freebsd.makeMinimal.version}-RELEASE"; + + AWK = "awk"; + CHMOD = "chmod"; + FIND = "find"; + MKDIR = "mkdir -p"; + PKG_BIN = "${buildPackages.pkg}/bin/pkg"; + RM = "rm -f"; + SED = "${buildPackages.freebsd.sed}/bin/sed"; + SETENV = "env"; + SH = "sh"; + TOUCH = "touch"; + XARGS = "xargs"; + + ABI_FILE = runCommandCC "abifile" {} "$CC -shared -o $out"; + CLEAN_FETCH_ENV = true; + INSTALL_AS_USER = true; + NO_CHECKSUM = true; + NO_MTREE = true; + SRC_BASE = freebsd.freebsdSrc; + + preUnpack = '' + export MAKE_JOBS_NUMBER="$NIX_BUILD_CORES" + + export DISTDIR="$PWD/distfiles" + export PKG_DBDIR="$PWD/pkg" + export PREFIX="$prefix" + + mkdir -p "$DISTDIR/evdev-proto" + tar -C "$DISTDIR/evdev-proto" \ + -xf ${linuxHeaders.src} \ + --strip-components 4 \ + linux-${linuxHeaders.version}/include/uapi/linux + ''; + + makeFlags = [ "DIST_SUBDIR=evdev-proto" ]; + + postInstall = '' + mv $prefix $out + ''; + + meta = with lib; { + description = "Input event device header files for FreeBSD"; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.freebsd; + license = licenses.gpl2Only; + }; +} diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 37a0c35b186..1033927ce67 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -54,7 +54,8 @@ in makeScopeWithSplicing mkDerivation = lib.makeOverridable (attrs: let stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; in stdenv'.mkDerivation ({ - name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; + pname = "${attrs.pname or (baseNameOf attrs.path)}-netbsd"; + inherit (attrs) version; src = fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; @@ -679,6 +680,13 @@ in makeScopeWithSplicing ## ## START LIBRARIES ## + libarch = mkDerivation { + path = "lib/libarch"; + version = "9.2"; + sha256 = "6ssenRhuSwp0Jn71ErT0PrEoCJ+cIYRztwdL4QTDZsQ="; + meta.platforms = lib.platforms.netbsd; + }; + libutil = mkDerivation { path = "lib/libutil"; version = "9.2"; @@ -808,6 +816,16 @@ in makeScopeWithSplicing meta.platforms = lib.platforms.netbsd; }; + libpci = mkDerivation { + pname = "libpci"; + path = "lib/libpci"; + version = "9.2"; + sha256 = "+IOEO1Bw3/H3iCp3uk3bwsFZbvCqN5Ciz70irnPl8E8="; + NIX_CFLAGS_COMPILE = [ "-I." ]; + meta.platforms = lib.platforms.netbsd; + extraPaths = with self; [ sys.src ]; + }; + libpthread-headers = mkDerivation { pname = "libpthread-headers"; path = "lib/libpthread"; diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix index f648435eed2..72a37502845 100644 --- a/pkgs/os-specific/darwin/DarwinTools/default.nix +++ b/pkgs/os-specific/darwin/DarwinTools/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "1"; src = fetchurl { - url = "https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz"; - sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp"; + url = "https://web.archive.org/web/20180408044816/https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz"; + hash = "sha256-Fzo5QhLd3kZHVFKhJe7xzV6bmRz5nAsG2mNLkAqVBEI="; }; patches = [ diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix index d7ac5d9fd90..839548ae8ff 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix @@ -45,12 +45,20 @@ let cp -r ${MacOSX-SDK}${standardFrameworkPath name private} $out/Library/Frameworks + if [[ -d ${MacOSX-SDK}/usr/lib/swift/${name}.swiftmodule ]]; then + mkdir -p $out/lib/swift + cp -r -t $out/lib/swift \ + ${MacOSX-SDK}/usr/lib/swift/${name}.swiftmodule \ + ${MacOSX-SDK}/usr/lib/swift/libswift${name}.tbd + fi + # Fix and check tbd re-export references chmod u+w -R $out find $out -name '*.tbd' -type f | while read tbd; do echo "Fixing re-exports in $tbd" rewrite-tbd \ -p ${standardFrameworkPath name private}/:$out/Library/Frameworks/${name}.framework/ \ + -p /usr/lib/swift/:$out/lib/swift/ \ ${mkDepsRewrites deps} \ -r ${builtins.storeDir} \ "$tbd" @@ -163,6 +171,15 @@ in rec { # Seems to be appropriate given https://developer.apple.com/forums/thread/666686 JavaVM = super.JavaNativeFoundation; + + CoreVideo = lib.overrideDerivation super.CoreVideo (drv: { + installPhase = drv.installPhase + '' + # When used as a module, complains about a missing import for + # Darwin.C.stdint. Apparently fixed in later SDKs. + awk -i inplace '/CFBase.h/ { print "#include <stdint.h>" } { print }' \ + $out/Library/Frameworks/CoreVideo.framework/Headers/CVBase.h + ''; + }); }; bareFrameworks = ( diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index a4f71f12821..145c98496b4 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -3,16 +3,7 @@ , xar, cpio, python3, pbzx }: let - MacOSX-SDK = stdenvNoCC.mkDerivation rec { - pname = "MacOSX-SDK"; - version = "11.0.0"; - - # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog - src = fetchurl { - url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_macOSNMOS_SDK.pkg"; - sha256 = "0n425smj4q1vxbza8fzwnk323fyzbbq866q32w288c44hl5yhwsf"; - }; - + mkSusDerivation = args: stdenvNoCC.mkDerivation (args // { dontBuild = true; darwinDontCodeSign = true; @@ -24,16 +15,45 @@ let pbzx $src | cpio -idm ''; + passthru = { + inherit (args) version; + }; + }); + + MacOSX-SDK = mkSusDerivation { + pname = "MacOSX-SDK"; + version = "11.0.0"; + + # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog + src = fetchurl { + url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_macOSNMOS_SDK.pkg"; + sha256 = "0n425smj4q1vxbza8fzwnk323fyzbbq866q32w288c44hl5yhwsf"; + }; + installPhase = '' cd Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk mkdir $out cp -r System usr $out/ ''; + }; - passthru = { - inherit version; + CLTools_Executables = mkSusDerivation { + pname = "CLTools_Executables"; + version = "11.0.0"; + + # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog + src = fetchurl { + url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_Executables.pkg"; + sha256 = "0nvb1qx7l81l2wcl8wvgbpsg5rcn51ylhivqmlfr2hrrv3zrrpl0"; }; + + installPhase = '' + cd Library/Developer/CommandLineTools + + mkdir $out + cp -r Library usr $out/ + ''; }; callPackage = newScope (packages // pkgs.darwin // { inherit MacOSX-SDK; }); @@ -43,7 +63,7 @@ let # TODO: this is nice to be private. is it worth the callPackage above? # Probably, I don't think that callPackage costs much at all. - inherit MacOSX-SDK; + inherit MacOSX-SDK CLTools_Executables; Libsystem = callPackage ./libSystem.nix {}; LibsystemCross = pkgs.darwin.Libsystem; @@ -64,8 +84,13 @@ let inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreServices CoreGraphics ImageIO; }; + rustPlatform = pkgs.makeRustPlatform { + inherit (pkgs.darwin.apple_sdk_11_0) stdenv; + inherit (pkgs) rustc cargo; + }; + callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec { - inherit (pkgs.darwin.apple_sdk_11_0) stdenv xcodebuild; + inherit (pkgs.darwin.apple_sdk_11_0) stdenv xcodebuild rustPlatform; darwin = pkgs.darwin.overrideScope (_: prev: { inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; apple_sdk = prev.darwin.apple_sdk_11_0; diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix index dc4ab1955b5..59cbc2b1063 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix @@ -75,7 +75,7 @@ FileProviderUI = {}; FinderSync = {}; ForceFeedback = { inherit IOKit; }; - Foundation = { inherit ApplicationServices CoreFoundation Security SystemConfiguration libobjc; }; + Foundation = { inherit ApplicationServices CoreFoundation Security SystemConfiguration Combine libobjc; }; GLKit = {}; GLUT = { inherit OpenGL; }; GSS = {}; @@ -169,7 +169,7 @@ Speech = {}; SpriteKit = {}; StoreKit = {}; - SwiftUI = {}; + SwiftUI = { inherit AppKit DeveloperToolsSupport UniformTypeIdentifiers; }; SyncServices = {}; System = {}; SystemConfiguration = { inherit Security; }; diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix index 0297f8897f1..7be670425d7 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { ]; installPhase = '' - mkdir -p $out/{include,lib} + mkdir -p $out/{include,lib/swift} for dir in $includeDirs; do from=${MacOSX-SDK}/usr/include/$dir @@ -57,6 +57,13 @@ stdenvNoCC.mkDerivation { $out/lib done + for name in os Dispatch; do + cp -dr \ + ${MacOSX-SDK}/usr/lib/swift/$name.swiftmodule \ + ${MacOSX-SDK}/usr/lib/swift/libswift$name.tbd \ + $out/lib/swift + done + for f in $csu; do from=${MacOSX-SDK}/usr/lib/$f if [ -e "$from" ]; then @@ -71,6 +78,7 @@ stdenvNoCC.mkDerivation { rewrite-tbd \ -c /usr/lib/libsystem.dylib:$out/lib/libsystem.dylib \ -p /usr/lib/system/:$out/lib/system/ \ + -p /usr/lib/swift/:$out/lib/swift/ \ -r ${builtins.storeDir} \ "$tbd" done diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix index 63ef2a1c263..9288097ef36 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix @@ -8,14 +8,17 @@ let self = stdenvNoCC.mkDerivation { dontBuild = true; installPhase = '' - mkdir -p $out/{include,lib} + mkdir -p $out/{include,lib/swift} cp -r ${MacOSX-SDK}/usr/include/objc $out/include cp ${MacOSX-SDK}/usr/lib/libobjc* $out/lib + cp -r ${MacOSX-SDK}/usr/lib/swift/ObjectiveC.swiftmodule $out/lib/swift + cp ${MacOSX-SDK}/usr/lib/swift/libswiftObjectiveC.tbd $out/lib/swift ''; passthru = { tbdRewrites = { const."/usr/lib/libobjc.A.dylib" = "${self}/lib/libobjc.A.dylib"; + const."/usr/lib/swift/libswiftObjectiveC.dylib" = "${self}/lib/swift/libswiftObjectiveC.dylib"; }; }; }; in self diff --git a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix index b413744677d..74f1160e430 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix @@ -5,8 +5,6 @@ appleDerivation' stdenv { srcs = lib.attrValues IOKitSrcs; sourceRoot = "."; - phases = [ "unpackPhase" "installPhase" ]; - __propagatedImpureHostDeps = [ "/System/Library/Frameworks/IOKit.framework/IOKit" "/System/Library/Frameworks/IOKit.framework/Resources" diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix b/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix index bb09adce252..f4fe65b8066 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix @@ -1,8 +1,6 @@ { appleDerivation', stdenv, darwin-stubs }: appleDerivation' stdenv { - phases = [ "unpackPhase" "installPhase" ]; - __propagatedImpureHostDeps = [ "/System/Library/Frameworks/Security.framework/Security" "/System/Library/Frameworks/Security.framework/Resources" diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix index 1f13cbef9fc..6678f1f5b25 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix @@ -1,9 +1,9 @@ -{ appleDerivation, xcbuildHook, CoreSymbolication +{ appleDerivation, xcbuildHook, CoreSymbolication, apple_sdk , xnu, bison, flex, darling, stdenv, fixDarwinDylibNames }: appleDerivation { nativeBuildInputs = [ xcbuildHook flex bison fixDarwinDylibNames ]; - buildInputs = [ CoreSymbolication darling xnu ]; + buildInputs = [ CoreSymbolication apple_sdk.frameworks.CoreSymbolication darling xnu ]; # -fcommon: workaround build failure on -fno-common toolchains: # duplicate symbol '_kCSRegionMachHeaderName' in: libproc.o dt_module_apple.o NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration -fcommon"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix index 64de728805f..4082f5b760c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix @@ -1,8 +1,7 @@ { appleDerivation', stdenvNoCC }: appleDerivation' stdenvNoCC { - phases = [ "unpackPhase" "installPhase" ]; - + dontBuild = true; installPhase = '' mkdir -p $out/include cp mDNSShared/dns_sd.h $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix index 2fc4afa77d9..315f0fb0621 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix @@ -1,8 +1,6 @@ { appleDerivation, darwin-stubs }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - # Not strictly necessary, since libSystem depends on it, but it's nice to be explicit so we # can easily find out what's impure. __propagatedImpureHostDeps = [ diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix index 4a1435ba5d2..07645c5e61c 100644 --- a/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -23,68 +23,30 @@ stdenv.mkDerivation (finalAttrs: { pname = "MoltenVK"; - version = "1.2.0"; - - buildInputs = [ AppKit Foundation Metal QuartzCore cereal ] - ++ lib.attrValues finalAttrs.passthru; + version = "1.2.1"; + + buildInputs = [ + AppKit + Foundation + Metal + QuartzCore + cereal + glslang + spirv-cross + spirv-headers + spirv-tools + vulkan-headers + ]; nativeBuildInputs = [ cctools sigtool xcbuild ]; outputs = [ "out" "bin" "dev" ]; - # MoltenVK requires specific versions of its dependencies. - # Pin them here except for cereal, which is four years old and has several CVEs. - passthru = { - glslang = (glslang.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "glslang"; - rev = "5755de46b07e4374c05fb1081f65f7ae1f8cca81"; - hash = "sha256-huPrQr+lPi7QCF8CufAavHEKGDDimGrcskiojhH9QYk="; - }; - patches = [ ]; - })).override { inherit (finalAttrs.passthru) spirv-headers spirv-tools; }; - spirv-cross = spirv-cross.overrideAttrs (old: { - cmakeFlags = (old.cmakeFlags or [ ]) - ++ [ "-DSPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross" ]; - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Cross"; - rev = "f09ba2777714871bddb70d049878af34b94fa54d"; - hash = "sha256-yVpLW1DbcHDuM9Bm3uGhAC0v9XjmpBoU9x7kmWdg6/o="; - }; - }); - spirv-headers = spirv-headers.overrideAttrs (_: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "spirv-headers"; - rev = "85a1ed200d50660786c1a88d9166e871123cce39"; - hash = "sha256-lUWgZYGPu+IaLUrbtyC7R0o3Hq/q7C7BE8r7DAsiC30="; - }; - }); - spirv-tools = (spirv-tools.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "spirv-tools"; - rev = "eb0a36633d2acf4de82588504f951ad0f2cecacb"; - hash = "sha256-sqjQoz9v9alSPc0ujEcWZxDAWh2S6oAPP1+JZmNCpA0="; - }; - })).override { inherit (finalAttrs.passthru) spirv-headers; }; - vulkan-headers = vulkan-headers.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-Headers"; - rev = "98f440ce6868c94f5ec6e198cc1adda4760e8849"; - hash = "sha256-EoD48jBoJmIet4BDC6bYxOsKK2358SZ/NcZeM61q/5g="; - }; - }); - }; - src = fetchFromGitHub { owner = "KhronosGroup"; repo = "MoltenVK"; rev = "v${finalAttrs.version}"; - hash = "sha256-PqrKGNGw7nJbirRgIargIV6Jbgoblu+2fn5qdHKI6BI="; + hash = "sha256-JqHPKLSFq+8hyOjVZbjh4AsHM8zSF7ZVxlEePmnEC2w="; }; patches = [ @@ -98,6 +60,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \ --replace '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \ --replace '$(git rev-parse HEAD)' ${finalAttrs.src.rev} + # Use the SPIRV-Cross packaged in nixpkgs instead of one built specifically for MoltenVK. + substituteInPlace MoltenVK/MoltenVK.xcodeproj/project.pbxproj \ + --replace SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross + substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \ + --replace SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross # Adding all of `usr/include` from the SDK results in header conflicts with `libcxx.dev`. # Work around it by symlinking just the SIMD stuff needed by MoltenVK. mkdir -p build/include @@ -108,8 +75,8 @@ stdenv.mkDerivation (finalAttrs: { NIX_CFLAGS_COMPILE = [ "-isystem ${lib.getDev libcxx}/include/c++/v1" - "-I${finalAttrs.passthru.spirv-cross}/include/spirv_cross" - "-I${finalAttrs.passthru.spirv-headers}/include/spirv/unified1/" + "-I${lib.getDev spirv-cross}/include/spirv_cross" + "-I${lib.getDev spirv-headers}/include/spirv/unified1/" ]; buildPhase = '' diff --git a/pkgs/os-specific/darwin/xattr/default.nix b/pkgs/os-specific/darwin/xattr/default.nix index a1e3c491487..7fe0f84606c 100644 --- a/pkgs/os-specific/darwin/xattr/default.nix +++ b/pkgs/os-specific/darwin/xattr/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchzip +, fetchFromGitHub , buildPythonPackage , python , ed @@ -11,9 +11,11 @@ buildPythonPackage rec { pname = "xattr"; version = "61.60.1"; - src = fetchzip rec { - url = "https://opensource.apple.com/tarballs/python_modules/python_modules-${version}.tar.gz"; - sha256 = "19kydl7w4vpdi7zmfd5z9vjkq24jfk2cv4j0pppw69j06czhdwwi"; + src = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "python_modules"; + rev = "python_modules-${version}"; + hash = "sha256-kfMGPzNAJsPvvUCSzcR0kgg85U6/NFf/ie1uwg9tfqY="; }; sourceRoot = "${src.name}/Modules/xattr-0.6.4"; @@ -61,7 +63,10 @@ buildPythonPackage rec { ''; makeWrapperArgs = [ - "--prefix" "PYTHONPATH" ":" "${placeholder "python"}/${python.sitePackages}" + "--prefix" + "PYTHONPATH" + ":" + "${placeholder "python"}/${python.sitePackages}" ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index da0660ad113..e6961684d0e 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -5,15 +5,18 @@ , nixosTests }: +let + tag = "0.3.0"; +in stdenv.mkDerivation { pname = "apfs"; - version = "unstable-2022-10-20-${kernel.version}"; + version = "${tag}-${kernel.version}"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "linux-apfs-rw"; - rev = "e6eb67c92d425d395eac1c4403629391bdd5064d"; - sha256 = "sha256-6rv5qZCjOqt0FaNFhA3tYg6/SdssvoT8kPVhalajgOo="; + rev = "v${tag}"; + sha256 = "sha256-ABFqkiIJuFapFsUIFHfw8+TujePZm7ZX/qHuFO2KdnQ="; }; hardeningDisable = [ "pic" ]; @@ -29,6 +32,15 @@ stdenv.mkDerivation { meta = with lib; { description = "APFS module for linux"; + longDescription = '' + The Apple File System (APFS) is the copy-on-write filesystem currently + used on all Apple devices. This module provides a degree of experimental + support on Linux. + If you make use of the write support, expect data corruption. + Read-only support is somewhat more complete, with sealed volumes, + snapshots, and all the missing compression algorithms recently added. + Encryption is still not in the works though. + ''; homepage = "https://github.com/linux-apfs/linux-apfs-rw"; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ax99100/default.nix b/pkgs/os-specific/linux/ax99100/default.nix index 9167b4e5f89..600e02de707 100644 --- a/pkgs/os-specific/linux/ax99100/default.nix +++ b/pkgs/os-specific/linux/ax99100/default.nix @@ -1,15 +1,35 @@ -{ kernel, stdenv, kmod, lib, fetchzip }: +{ kernel, stdenv, kmod, lib, fetchzip, fetchpatch, dos2unix }: stdenv.mkDerivation { pname = "ax99100"; version = "1.8.0"; - nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + + nativeBuildInputs = [ dos2unix kmod ] ++ kernel.moduleBuildDependencies; + src = fetchzip { url = "https://www.asix.com.tw/en/support/download/file/1229"; sha256 = "1rbp1m01qr6b3nbr72vpbw89pjh8mddc60im78z2yjd951xkbcjh"; extension = "tar.bz2"; }; + prePatch = '' + # The sources come with Windows file endings and that makes + # applying patches hard without first fixing the line endings. + dos2unix *.c *.h + ''; + + # The patches are adapted from: https://aur.archlinux.org/packages/asix-ax99100 + # + # We included them here instead of fetching them, because of line + # ending issues that are easier to fix manually. Also the + # set_termios patch needs to be applied for 6.1 not for 6.0. + patches = [ + ./kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch + ./kernel-6.1-set_termios-const-ktermios.patch + ]; + + patchFlags = [ "-p0" ]; + makeFlags = [ "KDIR='${kernel.dev}/lib/modules/${kernel.modDirVersion}/build'" ]; installPhase = '' @@ -18,12 +38,13 @@ stdenv.mkDerivation ''; meta = { - description = "ASIX AX99100 Serial and Parralel Port driver"; + description = "ASIX AX99100 Serial and Parallel Port driver"; homepage = "https://www.asix.com.tw/en/product/Interface/PCIe_Bridge/AX99100"; # According to the source code in the tarball, the license is gpl2. license = lib.licenses.gpl2; platforms = lib.platforms.linux; - # currently, the build fails with kernels newer than 5.17 - broken = lib.versionAtLeast kernel.version "5.18.0"; + + # Older Linux versions need more patches to work. + broken = lib.versionOlder kernel.version "5.4.0"; }; } diff --git a/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch b/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch new file mode 100644 index 00000000000..05ec0cfad22 --- /dev/null +++ b/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch @@ -0,0 +1,14 @@ +diff -pNaru5 a/ax99100_sp.h b/ax99100_sp.h +--- ax99100_sp.h 2022-06-07 16:55:26.621034945 -0400 ++++ ax99100_sp.h 2022-06-07 16:58:32.488989767 -0400 +@@ -255,5 +255,10 @@ struct custom_eeprom { + #define _INLINE_ + #endif + + #define DEFAULT99100_BAUD 115200 + #endif ++ ++/* #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) */ ++#define pci_alloc_consistent(hwdev,size,dma_handle) dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC) ++#define pci_free_consistent(hwdev,size,vaddr,dma_handle) dma_free_coherent(&hwdev->dev, size, vaddr, dma_handle) ++/* #endif */ diff --git a/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch b/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch new file mode 100644 index 00000000000..8d75ad454cf --- /dev/null +++ b/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch @@ -0,0 +1,18 @@ +diff -pNaru5 a/ax99100_sp.c b/ax99100_sp.c +--- ax99100_sp.c 2023-01-02 23:44:46.707423858 -0500 ++++ ax99100_sp.c 2023-01-02 23:44:27.171293092 -0500 +@@ -1915,11 +1915,13 @@ static unsigned int serial99100_get_divi + DEBUG("In %s quot=%u----baud=%u-----------------------------END\n",__FUNCTION__,quot,baud); + return quot; + } + + //This is a port ops function to set the terminal settings. +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) ++static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, const struct ktermios *old) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) + static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, struct ktermios *old) + #else + static void serial99100_set_termios(struct uart_port *port, struct termios *termios, struct termios *old) + #endif + { diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index e44f90a3636..8ff4b16a1a5 100644 --- a/pkgs/os-specific/linux/blktrace/default.nix +++ b/pkgs/os-specific/linux/blktrace/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; # Official source - # "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" + # "https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" src = fetchurl { url = "https://brick.kernel.dk/snaps/blktrace-${version}.tar.bz2"; sha256 = "sha256-1t7aA4Yt4r0bG5+6cpu7hi2bynleaqf3yoa2VoEacNY="; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 020aee04af7..303eb801478 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -130,6 +130,10 @@ in stdenv.mkDerivation rec { mkdir $out/etc/bluetooth ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf + # https://github.com/NixOS/nixpkgs/issues/204418 + ln -s /etc/bluetooth/input.conf $out/etc/bluetooth/input.conf + ln -s /etc/bluetooth/network.conf $out/etc/bluetooth/network.conf + # Add missing tools, ref https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/bluez for files in `find tools/ -type f -perm -755`; do filename=$(basename $files) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 3feb590eb5d..8a510a4d0c5 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -50,14 +50,14 @@ in stdenv.mkDerivation rec { pname = "busybox"; - version = "1.35.0"; + version = "1.36.0"; # 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/${pname}-${version}.tar.bz2"; - sha256 = "sha256-+u6yRMNaNIozT0pZ5EYm7ocPsHtohNaMEK6LwZ+DppQ="; + sha256 = "sha256-VCdQyK98smMOIBeAtPmfPczusG9QW0eexoJBweavYaU="; }; hardeningDisable = [ "format" "pie" ] @@ -75,11 +75,6 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch?id=ed92963eb55bbc8d938097b9ccb3e221a94653f4"; sha256 = "sha256-vl1wPbsHtXY9naajjnTicQ7Uj3N+EQ8pRNnrdsiow+w="; }) - (fetchurl { - name = "CVE-2022-30065.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/busybox/CVE-2022-30065.patch?id=4ffd996b3f8298c7dd424b912c245864c816e354"; - sha256 = "sha256-+WSYxI6eF8S0tya/S62f9Nc6jVMnHO0q1OyM69GlNTY="; - }) ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; separateDebugInfo = true; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 5475a565b09..71bde6220a0 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,6 +1,8 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, protobuf, protobufc, asciidoc, iptables , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config, iproute2 -, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd }: +, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd +, buildPackages +}: stdenv.mkDerivation rec { pname = "criu"; @@ -22,9 +24,34 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython perl ]; - buildInputs = [ protobuf asciidoc xmlto libpaper libnl libcap libnet nftables libbsd ]; - propagatedBuildInputs = [ protobufc ] ++ (with python3.pkgs; [ python python3.pkgs.protobuf ]); + depsBuildBuild = [ protobufc buildPackages.stdenv.cc ]; + nativeBuildInputs = [ + pkg-config + asciidoc + xmlto + libpaper + docbook_xsl + which + makeWrapper + docbook_xml_dtd_45 + python3 + python3.pkgs.wrapPython + perl + ]; + buildInputs = [ + protobuf + libnl + libcap + libnet + nftables + libbsd + ]; + propagatedBuildInputs = [ + protobufc + ] ++ (with python3.pkgs; [ + python + python3.pkgs.protobuf + ]); postPatch = '' substituteInPlace ./Documentation/Makefile \ @@ -34,7 +61,27 @@ stdenv.mkDerivation rec { ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ''; - makeFlags = [ "PREFIX=$(out)" "ASCIIDOC=${asciidoc}/bin/asciidoc" "XMLTO=${xmlto}/bin/xmlto" ]; + makeFlags = let + # criu's Makefile infrastructure expects to be passed a target architecture + # which neither matches the config-tuple's first part, nor the + # targetPlatform.linuxArch attribute. Thus we take the latter and map it + # onto the expected string: + linuxArchMapping = { + "x86_64" = "x86"; + "arm" = "arm"; + "arm64" = "aarch64"; + "powerpc" = "ppc64"; + "s390" = "s390"; + "mips" = "mips"; + }; + in [ + "PREFIX=$(out)" + "ASCIIDOC=${buildPackages.asciidoc}/bin/asciidoc" + "XMLTO=${buildPackages.xmlto}/bin/xmlto" + ] ++ (lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [ + "ARCH=${linuxArchMapping."${stdenv.targetPlatform.linuxArch}"}" + "CROSS_COMPILE=${stdenv.targetPlatform.config}-" + ]); outputs = [ "out" "dev" "man" ]; @@ -58,7 +105,7 @@ stdenv.mkDerivation rec { description = "Userspace checkpoint/restore for Linux"; homepage = "https://criu.org"; license = licenses.gpl2; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/pkgs/os-specific/linux/device-tree/default.nix index 8b8cca911a9..fb8e92f2330 100644 --- a/pkgs/os-specific/linux/device-tree/default.nix +++ b/pkgs/os-specific/linux/device-tree/default.nix @@ -22,21 +22,19 @@ with lib; { # skip incompatible and non-matching overlays if [[ ! "$dtbCompat" =~ "$overlayCompat" ]]; then - echo -n "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")" - continue - fi - ${optionalString (o.filter != null) '' - if [[ "''${dtb//${o.filter}/}" == "$dtb" ]]; then - echo -n "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")" - continue - fi + echo "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")" + elif ${if (o.filter == null) then "false" else '' + [[ "''${dtb//${o.filter}/}" == "$dtb" ]] ''} - - echo -n "Applying overlay ${o.name} to $(basename "$dtb")... " - mv "$dtb"{,.in} - fdtoverlay -o "$dtb" -i "$dtb.in" "${o.dtboFile}" - echo "ok" - rm "$dtb.in" + then + echo "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")" + else + echo -n "Applying overlay ${o.name} to $(basename "$dtb")... " + mv "$dtb"{,.in} + fdtoverlay -o "$dtb" -i "$dtb.in" "${o.dtboFile}" + echo "ok" + rm "$dtb.in" + fi '')} done diff --git a/pkgs/os-specific/linux/dracut/default.nix b/pkgs/os-specific/linux/dracut/default.nix index 2b483e2c7c7..583bd4115ac 100644 --- a/pkgs/os-specific/linux/dracut/default.nix +++ b/pkgs/os-specific/linux/dracut/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - homepage = "https://dracut.wiki.kernel.org"; + homepage = "https://github.com/dracutdevs/dracut/wiki"; description = "An event driven initramfs infrastructure"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lilyinstarlight ]; diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index f0a05437b68..fe056be74a7 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.8.0"; + version = "2.8.2"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "sha256-Nw86s93v8ahc/yt5sNsGz4LRwzDPtBnIZNno8vpFdsY="; + sha256 = "sha256-KlRNI2lnUbNeQGY1G+Qm683yXRTNCJwWIri51+PAi9o="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/error-inject/default.nix b/pkgs/os-specific/linux/error-inject/default.nix index 87a40580deb..f4a54417217 100644 --- a/pkgs/os-specific/linux/error-inject/default.nix +++ b/pkgs/os-specific/linux/error-inject/default.nix @@ -10,7 +10,7 @@ version = "4cbe46321b4a81365ff3aafafe63967264dbfec5"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git"; + url = "https://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git"; rev = version; sha256 = "0gjapg2hrlxp8ssrnhvc19i3r1xpcnql7xv0zjgbv09zyha08g6z"; }; @@ -40,7 +40,7 @@ version = "9bd5e2c7886fca72f139cd8402488a2235957d41"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git"; rev = version; sha256 = "0bh6mzpk2mr4xidkammmkfk21b4dbq793qjg25ryyxd1qv0c6cg4"; }; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index b94f4351ff5..9a4f375289b 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "1.12.0"; + version = "unstable-2022-10-13"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-JZKZ7+1OMbBtUA7pAZ41TzeDDyiD0h7yTXJINJ5FjN4="; + rev = "bdc258b25df4d00f222fde0e3c5003bf88ef17b5"; + hash = "sha256-mt+vEp9FFf7smmE2PzuH/3EYl7h89RBN1zTVvv2qJ/o="; }; NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 9a2c20ca38a..03ab973c8b9 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "eventstat"; - version = "0.04.13"; + version = "0.05.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-psamt9omhakiO3Kx2EzofPL2VAsva7XKQTZmn6zKefA="; + hash = "sha256-yGEFegUpWNBsrGZJjWud3aOsRJgXsOJmXkgpXcsPHo0="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix new file mode 100644 index 00000000000..d8769b0f04d --- /dev/null +++ b/pkgs/os-specific/linux/fanctl/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitLab, rustPlatform }: + +rustPlatform.buildRustPackage rec { + version = "0.6.4"; + pname = "fanctl"; + + src = fetchFromGitLab { + owner = "mcoffin"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XmawybmqRJ9Lj6ii8TZBFwqdQZVp0pOLN4xiSLkU/bw="; + }; + + cargoSha256 = "sha256-tj00DXQEqC/8+3uzTMWcph+1fNTTVZLSJbV/5lLFkFs="; + + meta = with lib; { + description = "Replacement for fancontrol with more fine-grained control interface in its config file"; + homepage = "https://gitlab.com/mcoffin/fanctl"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ icewind1991 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index 2a6ae96cef1..cb33eb1c214 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -10,7 +10,7 @@ index b0ff5b106..13ac380d0 100644 ) endif diff --git a/data/meson.build b/data/meson.build -index 3a77a7bfc..747bd1988 100644 +index 865b20e26..ff1c2657b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -26,7 +26,7 @@ endif @@ -20,8 +20,8 @@ index 3a77a7bfc..747bd1988 100644 - install_dir: join_paths(sysconfdir, 'fwupd') + install_dir: join_paths(sysconfdir_install, 'fwupd') ) - plugin_quirks += join_paths(meson.current_source_dir(), 'power.quirk') - plugin_quirks += join_paths(meson.current_source_dir(), 'cfi.quirk') + plugin_quirks += files([ + 'power.quirk', diff --git a/data/pki/meson.build b/data/pki/meson.build index 3649fecea..c3462744b 100644 --- a/data/pki/meson.build @@ -57,28 +57,27 @@ index 3649fecea..c3462744b 100644 ) endif diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build -index 1d1698a7e..5469d00a6 100644 +index c20a1a05e..87b1fa930 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build -@@ -2,7 +2,7 @@ if build_standalone and get_option('lvfs') != 'false' - install_data([ - 'lvfs-testing.conf', - ], -- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d') -+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d') - ) - con3 = configuration_data() - if get_option('lvfs') == 'disabled' -@@ -15,7 +15,7 @@ if build_standalone and get_option('lvfs') != 'false' +@@ -15,14 +15,14 @@ if build_standalone and get_option('lvfs') != 'false' output: 'lvfs.conf', configuration: con3, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) + configure_file( + input: 'lvfs-testing.conf', + output: 'lvfs-testing.conf', + configuration: con3, + install: true, +- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), ++ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), + ) i18n.merge_file( input: 'lvfs.metainfo.xml', -@@ -49,12 +49,12 @@ configure_file( +@@ -54,12 +54,12 @@ configure_file( output: 'vendor.conf', configuration: con2, install: true, @@ -94,10 +93,10 @@ index 1d1698a7e..5469d00a6 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index e7980e965..2c66e2dc4 100644 +index d3e08af43..30011f548 100644 --- a/meson.build +++ b/meson.build -@@ -195,6 +195,12 @@ endif +@@ -193,6 +193,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -111,7 +110,7 @@ index e7980e965..2c66e2dc4 100644 gio = dependency('gio-2.0', version: '>= 2.45.8') giounix = dependency('gio-unix-2.0', version: '>= 2.45.8', required: false) diff --git a/meson_options.txt b/meson_options.txt -index 6cf92e72e..2e8568292 100644 +index 204690640..6fc7e8437 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ @@ -120,10 +119,10 @@ index 6cf92e72e..2e8568292 100644 option('consolekit', type : 'feature', description : 'ConsoleKit support', deprecated: {'true': 'enabled', 'false': 'disabled'}) option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support') diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build -index 67bd3b9d9..ad04a91b6 100644 +index 88c039f85..62a7691f3 100644 --- a/plugins/dell-esrt/meson.build +++ b/plugins/dell-esrt/meson.build -@@ -38,6 +38,6 @@ configure_file( +@@ -27,6 +27,6 @@ configure_file( output: 'dell-esrt.conf', configuration: con2, install: true, @@ -132,7 +131,7 @@ index 67bd3b9d9..ad04a91b6 100644 ) endif diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build -index d626c3ad3..5a2f847d5 100644 +index 23ec5ec82..b03826fc0 100644 --- a/plugins/msr/meson.build +++ b/plugins/msr/meson.build @@ -10,7 +10,7 @@ install_data(['fwupd-msr.conf'], @@ -142,27 +141,27 @@ index d626c3ad3..5a2f847d5 100644 - install_dir: join_paths(sysconfdir, 'fwupd') + install_dir: join_paths(sysconfdir_install, 'fwupd') ) - shared_module('fu_plugin_msr', - fu_hash, + plugin_builtins += static_library('fu_plugin_msr', + sources: [ diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index 95606e478..e5355e520 100644 +index 1e35b6ce9..33ca1447f 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build -@@ -43,7 +43,7 @@ shared_module('fu_plugin_redfish', - ) +@@ -35,7 +35,7 @@ plugin_builtin_redfish = static_library('fu_plugin_redfish', + plugin_builtins += plugin_builtin_redfish install_data(['redfish.conf'], - install_dir: join_paths(sysconfdir, 'fwupd'), + install_dir: join_paths(sysconfdir_install, 'fwupd'), + install_mode: 'rw-r-----', ) - if get_option('tests') diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build -index 5f8ffbf90..9ba323e75 100644 +index 71d930e62..399fb5781 100644 --- a/plugins/thunderbolt/meson.build +++ b/plugins/thunderbolt/meson.build -@@ -32,7 +32,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', - ) +@@ -19,7 +19,7 @@ plugin_builtin_thunderbolt = static_library('fu_plugin_thunderbolt', + plugin_builtins += plugin_builtin_thunderbolt install_data(['thunderbolt.conf'], - install_dir: join_paths(sysconfdir, 'fwupd') @@ -171,7 +170,7 @@ index 5f8ffbf90..9ba323e75 100644 # we use functions from 2.52 in the tests if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52') diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build -index ef38dc03e..78ff65e1d 100644 +index b4b038313..9c5407c3f 100644 --- a/plugins/uefi-capsule/meson.build +++ b/plugins/uefi-capsule/meson.build @@ -20,7 +20,7 @@ if host_machine.system() == 'linux' @@ -183,7 +182,7 @@ index ef38dc03e..78ff65e1d 100644 ) elif host_machine.system() == 'freebsd' backend_srcs += 'fu-uefi-backend-freebsd.c' -@@ -110,7 +110,7 @@ if get_option('compat_cli') and get_option('man') +@@ -87,7 +87,7 @@ if get_option('compat_cli') and get_option('man') endif install_data(['uefi_capsule.conf'], diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 66cfbef940b..8939aef06c5 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -15,6 +15,7 @@ , gusb , sqlite , libarchive +, libredirect , curl , libjcat , elfutils @@ -30,6 +31,7 @@ , protobufc , python3 , wrapGAppsNoGuiHook +, ensureNewerSourcesForZipFilesHook , json-glib , bash-completion , shared-mime-info @@ -52,6 +54,7 @@ , libmbim , libcbor , xz +, enableFlashrom ? false }: let @@ -74,7 +77,7 @@ let # # Currently broken on Aarch64 # haveFlashrom = isx86; # Experimental - haveFlashrom = false; + haveFlashrom = isx86 && enableFlashrom; runPythonCommand = name: buildCommandPython: runCommand name { nativeBuildInputs = [ python3 ]; @@ -85,13 +88,13 @@ let test-firmware = let - version = "unstable-2021-11-02"; + version = "unstable-2022-04-02"; src = fetchFromGitHub { name = "fwupd-test-firmware-${version}"; owner = "fwupd"; repo = "fwupd-test-firmware"; - rev = "aaa2f9fd68a40684c256dd85b86093cba38ffd9d"; - sha256 = "Slk7CNfkmvmOh3WtIBkPs3NYT96co6i8PwqcbpeVFgA="; + rev = "39954e434d63e20e85870dd1074818f48a0c08b7"; + hash = "sha256-d4qG3fKyxkfN91AplRYqARFz+aRr+R37BpE450bPxi0="; passthru = { inherit src version; # For update script updateScript = unstableGitUpdater { @@ -114,7 +117,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.8.4"; + version = "1.8.10"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -123,7 +126,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-rfoHQ0zcKexBxA/vRg6Nlwlj/gx+hJ3sfzkyrbFh+IY="; + hash = "sha256-vvNUidNdhW9xeksjEVnkIR7CZ4oBQizZJRMFtZUq6Ow="; }; patches = [ @@ -147,6 +150,8 @@ let ]; nativeBuildInputs = [ + # required for firmware zipping + ensureNewerSourcesForZipFilesHook meson ninja gi-docgen @@ -187,7 +192,7 @@ let libmbim libcbor libqmi - xz # for liblzma. + xz # for liblzma ] ++ lib.optionals haveDell [ libsmbios ] ++ lib.optionals haveFlashrom [ @@ -210,14 +215,9 @@ let "-Dsysconfdir_install=${placeholder "out"}/etc" "-Defi_os_dir=nixos" "-Dplugin_modem_manager=enabled" - # Requires Meson 0.63 - "-Dgresource_quirks=disabled" # We do not want to place the daemon into lib (cyclic reference) "--libexecdir=${placeholder "out"}/libexec" - # Our builder only adds $lib/lib to rpath but some things link - # against libfwupdplugin which is in $out/lib. - "-Dc_link_args=-Wl,-rpath,${placeholder "out"}/lib" ] ++ lib.optionals (!haveDell) [ "-Dplugin_dell=disabled" "-Dplugin_synaptics_mst=disabled" @@ -232,8 +232,7 @@ let # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF dontWrapGApps = true; - # /etc/os-release not available in sandbox - # doCheck = true; + doCheck = true; # Environment variables @@ -254,16 +253,18 @@ let postPatch = '' patchShebangs \ contrib/generate-version-script.py \ - meson_post_install.sh \ po/test-deps - # This checks a version of a dependency of gi-docgen but gi-docgen is self-contained in Nixpkgs. - echo "Clearing docs/test-deps.py" - test -f docs/test-deps.py - echo > docs/test-deps.py - substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \ --replace "gdbus" ${glib.bin}/bin/gdbus + + # tests fail with: Failed to load SMBIOS: neither SMBIOS or DT found + sed -i 's/test(.*)//' plugins/lenovo-thinklmi/meson.build + sed -i 's/test(.*)//' plugins/mtd/meson.build + # fails on amd cpu + sed -i 's/test(.*)//' libfwupdplugin/meson.build + # in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf + sed -i "s/get_option('tests')/false/" plugins/redfish/meson.build ''; preBuild = '' @@ -273,6 +274,10 @@ let preCheck = '' addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" + + echo "12345678901234567890123456789012" > machine-id + export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \ + LD_PRELOAD=${libredirect}/lib/libredirect.so ''; preInstall = '' @@ -328,7 +333,6 @@ let "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" "fwupd/remotes.d/vendor-directory.conf" - "fwupd/thunderbolt.conf" "fwupd/uefi_capsule.conf" "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" @@ -343,13 +347,14 @@ let "fwupd/redfish.conf" ] ++ lib.optionals haveMSR [ "fwupd/msr.conf" + ] ++ lib.optionals isx86 [ + "fwupd/thunderbolt.conf" ]; # DisabledPlugins key in fwupd/daemon.conf defaultDisabledPlugins = [ "test" "test_ble" - "invalid" ]; # For updating. diff --git a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch index afee6d9f61e..a91adc1a69b 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch @@ -1,13 +1,13 @@ diff --git a/meson.build b/meson.build -index b91dd037..01d70a61 100644 +index 7ac8c937a..5a23d0c80 100644 --- a/meson.build +++ b/meson.build -@@ -413,7 +413,7 @@ if build_standalone and efiboot.found() and efivar.found() +@@ -419,7 +419,7 @@ if build_standalone and efiboot.found() and efivar.found() conf.set('HAVE_EFI_TIME_T', '1') endif - efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') -+ efi_app_location = join_paths(dependency('fwupd-efi').get_pkgconfig_variable('prefix'), 'libexec', 'fwupd', 'efi') ++ efi_app_location = join_paths(dependency('fwupd-efi').get_variable(pkgconfig: 'prefix'), 'libexec', 'fwupd', 'efi') conf.set_quoted('EFI_APP_LOCATION', efi_app_location) if host_cpu == 'x86' diff --git a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch b/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch index f3369b6e133..e6269ae840b 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch @@ -1,37 +1,14 @@ -diff --git a/libfwupdplugin/meson.build b/libfwupdplugin/meson.build -index 1afa28e1..3da81d30 100644 ---- a/libfwupdplugin/meson.build -+++ b/libfwupdplugin/meson.build -@@ -220,7 +220,8 @@ fwupdplugin = library( - ], - link_args: cc.get_supported_link_arguments([vflag]), - link_depends: fwupdplugin_mapfile, -- install: true -+ install: true, -+ install_dir: bindir / '..' / 'lib', - ) - - fwupdplugin_pkgg = import('pkgconfig') -@@ -280,7 +281,8 @@ if introspection.allowed() - girtargets, - fwupd_gir[0], - ], -- install: true -+ install: true, -+ install_dir_typelib: bindir / '..' / 'lib' / 'girepository-1.0', - ) - - # Verify the map file is correct -- note we can't actually use the generated diff --git a/meson.build b/meson.build -index b91dd037..f97b4c26 100644 +index 9ae278b66..7cddf1a0d 100644 --- a/meson.build +++ b/meson.build -@@ -504,7 +504,7 @@ if build_standalone +@@ -507,7 +507,7 @@ if build_standalone if host_machine.system() == 'windows' - plugin_dir = 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current) + libdir_pkg = 'fwupd-@0@'.format(fwupd_version) else -- plugin_dir = join_paths(libdir, 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)) -+ plugin_dir = join_paths(bindir, '..', 'lib', 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)) +- libdir_pkg = join_paths(libdir, 'fwupd-@0@'.format(fwupd_version)) ++ libdir_pkg = join_paths(prefix, 'lib', 'fwupd-@0@'.format(fwupd_version)) endif - conf.set_quoted('FWUPD_PLUGINDIR', plugin_dir) + conf.set_quoted('FWUPD_LIBDIR_PKG', libdir_pkg) endif + diff --git a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch index 49bca65d9c6..a914f56c66d 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch @@ -1,19 +1,19 @@ diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build -index b8ec916f..38209b36 100644 +index be3d5c6d9..14d45dcaf 100644 --- a/data/installed-tests/meson.build +++ b/data/installed-tests/meson.build @@ -83,5 +83,5 @@ configure_file( - output : 'fwupd-tests.conf', - configuration : con2, + output: 'fwupd-tests.conf', + configuration: con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index b91dd037..d7e20b18 100644 +index 30011f548..7ac8c937a 100644 --- a/meson.build +++ b/meson.build -@@ -188,8 +188,8 @@ else +@@ -186,8 +186,8 @@ else datadir = join_paths(prefix, get_option('datadir')) sysconfdir = join_paths(prefix, get_option('sysconfdir')) localstatedir = join_paths(prefix, get_option('localstatedir')) @@ -24,7 +24,7 @@ index b91dd037..d7e20b18 100644 daemon_dir = join_paths(libexecdir, 'fwupd') endif mandir = join_paths(prefix, get_option('mandir')) -@@ -492,6 +492,7 @@ gnome = import('gnome') +@@ -498,6 +498,7 @@ gnome = import('gnome') i18n = import('i18n') conf.set_quoted('FWUPD_PREFIX', prefix) @@ -33,10 +33,10 @@ index b91dd037..d7e20b18 100644 conf.set_quoted('FWUPD_LIBDIR', libdir) conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir) diff --git a/meson_options.txt b/meson_options.txt -index d00038db..be1c45b4 100644 +index 6fc7e8437..29832fd08 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -56,6 +56,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated: +@@ -57,6 +57,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated: option('systemd_unit_user', type : 'string', description : 'User account to use for fwupd-refresh.service (empty for DynamicUser)') option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on') option('elogind', type : 'feature', description : 'elogind support', deprecated: {'true': 'enabled', 'false': 'disabled'}) @@ -44,16 +44,3 @@ index d00038db..be1c45b4 100644 option('tests', type : 'boolean', value : true, description : 'enable tests') option('soup_session_compat', type : 'boolean', value : true, description : 'enable SoupSession runtime compatibility support') option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'}) -diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c -index 4d19e560..91cfaa61 100644 ---- a/plugins/redfish/fu-self-test.c -+++ b/plugins/redfish/fu-self-test.c -@@ -27,7 +27,7 @@ fu_test_is_installed_test(void) - const gchar *builddir = g_getenv("G_TEST_BUILDDIR"); - if (builddir == NULL) - return FALSE; -- return g_str_has_prefix(builddir, FWUPD_PREFIX); -+ return g_str_has_prefix(builddir, FWUPD_INSTALLED_TEST_PREFIX); - } - - static void diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index 1c3f3342e08..100b51e301f 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "forkstat"; - version = "0.02.17"; + version = "0.03.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-Rw1Xwst0+seksTLL+v3IUEojGjwCERwF89xkk70npUU="; + hash = "sha256-hxheElo/v23Xt7m6GvDgGdyIH+fC4eZSUztiuBbQ8T8="; }; installFlags = [ diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 3c5443f3432..e8b9d0648bd 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { # fxload binary exist inside the `examples/bin` directory of `libusb1` postFixup = '' - mkdir -p $out/sbin - ln -s ${passthru.libusb}/examples/bin/fxload $out/sbin/fxload + mkdir -p $out/bin + ln -s ${passthru.libusb}/examples/bin/fxload $out/bin/fxload ''; passthru.libusb = libusb1.override { withExamples = true; }; diff --git a/pkgs/os-specific/linux/health-check/default.nix b/pkgs/os-specific/linux/health-check/default.nix index e876808b461..9e85281ea4c 100644 --- a/pkgs/os-specific/linux/health-check/default.nix +++ b/pkgs/os-specific/linux/health-check/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "health-check"; - version = "0.03.10"; + version = "0.03.11"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-1dm7tl7DHv1CzuLe1/UewDSUOanO0hN+STkPrAHcZmI="; + hash = "sha256-QLa/7kA0juefzOba7ELopDmOVfiGJReo4LCfhnxW1tk="; }; buildInputs = [ json_c libbsd ]; diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 3e5ea984970..5ff7529d239 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , patchelf , cmake , pkg-config @@ -21,6 +22,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-AdAQX8wurZjXHf3z8IPxnW57CDOwwYlgJ09dNNDhUYQ="; }; + patches = [ + # fix compile with level-zero 1.9.4 + (fetchpatch { + url = "https://github.com/intel/compute-runtime/commit/dce17d319f91b39806b2cd39b6eecd5c5cff2a68.patch"; + excludes = [ "manifests/manifest.yml" ]; + sha256 = "sha256-YGzS4LeNO8FO1GXowD2gARj0TL6tBFaeZJNLZOwSsWQ="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ intel-gmmlib intel-graphics-compiler libva level-zero ]; diff --git a/pkgs/os-specific/linux/iotop-c/default.nix b/pkgs/os-specific/linux/iotop-c/default.nix index 39429cba4b9..2917ace349f 100644 --- a/pkgs/os-specific/linux/iotop-c/default.nix +++ b/pkgs/os-specific/linux/iotop-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "sha256-MHjG14vZsuDrR9/SLotb7Uc3RW8Np9E2X0GXkSM+RxE="; + sha256 = "sha256-4DTYtUltmZ+nkm4ZLac+6JbBW3z+qby7sP33LwEXtcQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 951c84eaf49..8396fd5e3d3 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,42 +1,43 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns -, libcap, libidn2 +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gettext +, libxslt +, docbook_xsl_ns +, libcap +, libidn2 , iproute2 , apparmorRulesFromClosure }: -let - version = "20211215"; - sunAsIsLicense = { - fullName = "AS-IS, SUN MICROSYSTEMS license"; - url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "iputils"; - inherit version; + version = "20221126"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1vzdch1xi2x2j8mvnsr4wwwh7kdkgf926xafw5kkb74yy1wac5qv"; + hash = "sha256-XVoQhdjBmEK8TbCpaKLjebPw7ZT8iEvyLJDTCkzezeE="; }; - outputs = ["out" "apparmor"]; + outputs = [ "out" "apparmor" ]; # We don't have the required permissions inside the build sandbox: # /build/source/build/ping/ping: socket: Operation not permitted doCheck = false; mesonFlags = [ - "-DBUILD_RARPD=true" "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" "-DINSTALL_SYSTEMD_UNITS=true" "-DSKIP_TESTS=${lib.boolToString (!doCheck)}" ] - # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): - ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; + # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): + ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] @@ -65,23 +66,19 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://github.com/iputils/iputils"; + changelog = "https://github.com/iputils/iputils/releases/tag/${version}"; description = "A set of small useful utilities for Linux networking"; - inherit (src.meta) homepage; - changelog = "https://github.com/iputils/iputils/releases/tag/s${version}"; - license = with licenses; [ gpl2Plus bsd3 sunAsIsLicense ]; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos lheckemann ]; - longDescription = '' A set of small useful utilities for Linux networking including: - arping - clockdiff - ninfod - ping - rarpd - rdisc - tracepath + - arping: send ARP REQUEST to a neighbour host + - clockdiff: measure clock difference between hosts + - ping: send ICMP ECHO_REQUEST to network hosts + - tracepath: traces path to a network host discovering MTU along this path ''; + license = with licenses; [ gpl2Plus bsd3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos lheckemann ]; }; } diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index 600dd8a33a4..b221598c0e7 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "4.1.8"; + version = "4.1.9"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; - rev = "v${version}"; - hash = "sha256-b+1EM172NRnnTcbJOwBQfytIRuIr8zZBlKBBV/e7Ttg="; + rev = "refs/tags/v${version}"; + hash = "sha256-sKrjn/XQANiXfkjNiFfvAkmONyQjVigFBKgcGkuIPs0="; }; } diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2fee060932e..20679b3c951 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -283,7 +283,7 @@ let DRM_GMA500 = whenAtLeast "5.12" module; DRM_GMA600 = whenOlder "5.13" yes; DRM_GMA3600 = whenOlder "5.12" yes; - DRM_VMWGFX_FBCON = yes; + DRM_VMWGFX_FBCON = whenOlder "6.2" yes; # (experimental) amdgpu support for verde and newer chipsets DRM_AMDGPU_SI = yes; # (stable) amdgpu support for bonaire and newer chipsets @@ -431,7 +431,7 @@ let F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; - NFSD_V2_ACL = yes; + NFSD_V2_ACL = whenOlder "6.2" yes; NFSD_V3 = whenOlder "5.18" yes; NFSD_V3_ACL = yes; NFSD_V4 = yes; @@ -457,7 +457,7 @@ let CEPH_FS_POSIX_ACL = yes; SQUASHFS_FILE_DIRECT = yes; - SQUASHFS_DECOMP_MULTI_PERCPU = yes; + SQUASHFS_DECOMP_MULTI_PERCPU = whenOlder "6.2" yes; SQUASHFS_XATTR = yes; SQUASHFS_ZLIB = yes; SQUASHFS_LZO = yes; @@ -502,8 +502,8 @@ let SECURITY_APPARMOR = yes; DEFAULT_SECURITY_APPARMOR = yes; - RANDOM_TRUST_CPU = whenAtLeast "4.19" yes; # allow RDRAND to seed the RNG - RANDOM_TRUST_BOOTLOADER = whenAtLeast "5.4" yes; # allow the bootloader to seed the RNG + RANDOM_TRUST_CPU = whenOlder "6.2" (whenAtLeast "4.19" yes); # allow RDRAND to seed the RNG + RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" (whenAtLeast "5.4" yes); # allow the bootloader to seed the RNG MODULE_SIG = no; # r13y, generates a random key during build and bakes it in # Depends on MODULE_SIG and only really helps when you sign your modules @@ -830,7 +830,7 @@ let EFI_STUB = yes; # EFI bootloader in the bzImage itself EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER = - whenAtLeast "5.8" yes; # initrd kernel parameter for EFI + whenOlder "6.2" (whenAtLeast "5.8" yes); # initrd kernel parameter for EFI CGROUPS = yes; # used by systemd FHANDLE = yes; # used by systemd SECCOMP = yes; # used by systemd >= 231 diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index fe406af8c3a..a2cace8bc1e 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,71 +2,61 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.303-hardened1.patch", - "sha256": "1ihq6kf19fribpyiisv5wdax0467pylmlmsqn88vf50ps3akc4ix", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.303-hardened1/linux-hardened-4.14.303-hardened1.patch" + "name": "linux-hardened-4.14.304-hardened1.patch", + "sha256": "099fqlfl9p57pfh5jr7cv30476q2cbhrqs6w63cy3mkwj7l4jwln", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.304-hardened1/linux-hardened-4.14.304-hardened1.patch" }, - "sha256": "17pxl4fgzpz48y7nx1z8891mll64givxgch3z5an6dkr13c2xy2b", - "version": "4.14.303" + "sha256": "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4", + "version": "4.14.304" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.270-hardened1.patch", - "sha256": "1xii5xchbxnswy7qhhvvivx6c6a5n7iw920yrvm2chrnp5s9mikh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.270-hardened1/linux-hardened-4.19.270-hardened1.patch" + "name": "linux-hardened-4.19.271-hardened1.patch", + "sha256": "0xvd9n2fqmr863a4vljki2saa85dccj7mflcfwaslj9g2ygbrf93", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.271-hardened1/linux-hardened-4.19.271-hardened1.patch" }, - "sha256": "14nj1skd73rn59v2ah80vgpc8fh37jvpc75wafpa4glfphx88i11", - "version": "4.19.270" + "sha256": "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3", + "version": "4.19.271" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.164-hardened1.patch", - "sha256": "1z2qd460wnna658zi8mbz2rqjwbvkxrk03ncicqszfjbinigxp6x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.164-hardened1/linux-hardened-5.10.164-hardened1.patch" + "name": "linux-hardened-5.10.165-hardened1.patch", + "sha256": "0gnvnywagqqdsdrbd9fbl671pzfv49mf2xqan9bk3q41mgcyyfgg", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.165-hardened1/linux-hardened-5.10.165-hardened1.patch" }, - "sha256": "0y42xgpmg2mhx81d3bswhk0n3f8vdvmf4k0g8ii6cb01gflalzhc", - "version": "5.10.164" + "sha256": "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp", + "version": "5.10.165" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.89-hardened1.patch", - "sha256": "0gwgdgmc9c7cpgp5vcyxwqxc5y2br3ghi6x3r11frs1kcwvqjix9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.89-hardened1/linux-hardened-5.15.89-hardened1.patch" + "name": "linux-hardened-5.15.90-hardened1.patch", + "sha256": "1zj80v6xpgz00z1lpw5j9qdm0gp44pk7vkflrngbk8m3cwmpw5ha", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.90-hardened1/linux-hardened-5.15.90-hardened1.patch" }, - "sha256": "1s1gflnzvfza5m94c9f3l42kskjadayij4q5gk9vcjq19s3incg7", - "version": "5.15.89" + "sha256": "0hiv74mxkp3v04lphnyw16akgavaz527bzhnfnpm6rv848047zg6", + "version": "5.15.90" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.229-hardened1.patch", - "sha256": "0cww74kkh2n7apzqbdz72d04x39wkasxj5mi7giivpp0s2f0c24a", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.229-hardened1/linux-hardened-5.4.229-hardened1.patch" + "name": "linux-hardened-5.4.230-hardened1.patch", + "sha256": "0xk80i6wddd909wzhcp7b64sbsjjqpwyjr8gknpc83zcdzv3y892", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.230-hardened1/linux-hardened-5.4.230-hardened1.patch" }, - "sha256": "1bx77x4x10v38ygfiz0dcw938ybczq7f3srg11ifzvwm243r5if5", - "version": "5.4.229" - }, - "6.0": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-6.0.19-hardened1.patch", - "sha256": "11yn5mrvs170685pwa9k7asxlv64vgfqfg2b6m5yn2a11pr1rxg5", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.19-hardened1/linux-hardened-6.0.19-hardened1.patch" - }, - "sha256": "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb", - "version": "6.0.19" + "sha256": "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7", + "version": "5.4.230" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.7-hardened1.patch", - "sha256": "1hp3mbl8vfd2cwpxbhmqqy77nzyk265k1rcf1rz048ivnsppw4cx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.7-hardened1/linux-hardened-6.1.7-hardened1.patch" + "name": "linux-hardened-6.1.8-hardened1.patch", + "sha256": "1ry0cb1dsq84n6cxn8ndx47qz1g69kqlfkb16rrlgk49w81i8y8z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.8-hardened1/linux-hardened-6.1.8-hardened1.patch" }, - "sha256": "03v0pvg831qzbpc09ip1h0p4zz6js9das7vzh8xhsf77sax4ic2a", - "version": "6.1.7" + "sha256": "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn", + "version": "6.1.8" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index c76fc306bb4..3e5cc009576 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.303"; + version = "4.14.304"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "17pxl4fgzpz48y7nx1z8891mll64givxgch3z5an6dkr13c2xy2b"; + sha256 = "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 999cf84a5d2..506d57d7971 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.270"; + version = "4.19.271"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14nj1skd73rn59v2ah80vgpc8fh37jvpc75wafpa4glfphx88i11"; + sha256 = "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 86698c5f3a3..b2a9f27947c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.164"; + version = "5.10.166"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0y42xgpmg2mhx81d3bswhk0n3f8vdvmf4k0g8ii6cb01gflalzhc"; + sha256 = "1bz1sgkqniwg84wv9vcg08mksa5q533vgynsd3y0xnjv1rwa2l80"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 35a9097c14c..9ae7546f3c9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.89"; + version = "5.15.91"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1s1gflnzvfza5m94c9f3l42kskjadayij4q5gk9vcjq19s3incg7"; + sha256 = "107yw7mibibhfrggm8idzn5bayjvkxaq1kv3kkm1lpxipsqjng56"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a9b04d5bc07..aef87aaa421 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.229"; + version = "5.4.230"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1bx77x4x10v38ygfiz0dcw938ybczq7f3srg11ifzvwm243r5if5"; + sha256 = "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix deleted file mode 100644 index 87050462e61..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "6.0.19"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = versions.pad 3 version; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb"; - }; -} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index dd42454b3ac..2bed730a8b1 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.7"; + version = "6.1.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "03v0pvg831qzbpc09ip1h0p4zz6js9das7vzh8xhsf77sax4ic2a"; + sha256 = "0awjynyy049px0h7li59w3zgn3z39alv6glzrmx6wf1wd62z236n"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index aefd662aa4d..6a1ba266a37 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.162-rt78"; # updated by ./update-rt.sh + version = "5.10.165-rt81"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "05yjgp1la5flwqji9b6j7nbdgg5fwzv2ph536v4f9pzza3y01i1f"; + sha256 = "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "146y62kzxm0d7bw8riqds0m8iilx3zd6yh5dfxr5q90jcjnah16x"; + sha256 = "1441lwmz4v427gcyddps17ms96y86klmnlw95kc74j6wmy387fcg"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 8a6d1a89dc8..115d8ad9314 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, commitDate ? "2022-12-29" -, currentCommit ? "8f064a4cb5c7cce289b83d7a459e6d8620188b37" -, diffHash ? "sha256-RnlM7uOSWhFHG1aj5BOjrfRtoZfbx+tqQw1V49nW5vw=" +, commitDate ? "2023-02-01" +, currentCommit ? "65960c284ad149cc4bfbd64f21e6889c1e3d1c5f" +, diffHash ? "sha256-4wpY3aYZ93OXSU4wmQs9K62nPyIzjKu4RBQTwksmyyk=" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} @@ -17,7 +17,7 @@ extraMeta = { branch = "master"; - maintainers = with lib.maintainers; [ davidak Madouura ]; + maintainers = with lib.maintainers; [ davidak Madouura pedrohlc ]; }; } // argsOverride; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 244fced25ef..cef442ad20c 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.2-rc2"; + version = "6.2-rc6"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-QRmOwtoGG2uNCNcAIAltrCT7zaD2V+RNe3bjHGn5+ts="; + hash = "sha256-rEpJYw5O6OHSwNY8LxlCsw0p9+u9BUjTQ8FsB6+fLbc="; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index ae028b980ce..c1f6fd03a2e 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -108,7 +108,6 @@ stdenv.mkDerivation { libunwind zlib openssl - systemtap.stapBuild numactl python3 perl @@ -116,6 +115,7 @@ stdenv.mkDerivation { ] ++ (if (lib.versionAtLeast kernel.version "5.19") then [ libbfd libopcodes ] else [ libbfd_2_38 libopcodes_2_38 ]) + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform systemtap) systemtap.stapBuild ++ lib.optional withGtk gtk2 ++ lib.optional withZstd zstd ++ lib.optional withLibcap libcap diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index a5376d56418..35cb84e0774 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.1.6"; #zen + version = "6.1.9"; #zen suffix = "zen1"; #zen - sha256 = "14f24w8cww1096lawrk0absx6sqy4mm0f2wpsijgjx4br2ln7p4r"; #zen + sha256 = "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.1.6"; #lqx + version = "6.1.9"; #lqx suffix = "lqx1"; #lqx - sha256 = "0w1ckias1j1baidyw1a6kq1za7i3ig0w1phkb4s7sw9p7bnhbrx1"; #lqx + sha256 = "167qr1mxsr5llmzixsijsn72d8jyphhgg2k8qsf369m7y58sz0s9"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/ksmbd-tools/default.nix b/pkgs/os-specific/linux/ksmbd-tools/default.nix index d0a1f1f4e68..5a58c198c0e 100644 --- a/pkgs/os-specific/linux/ksmbd-tools/default.nix +++ b/pkgs/os-specific/linux/ksmbd-tools/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ksmbd-tools"; - version = "3.4.5"; + version = "3.4.6"; src = fetchFromGitHub { owner = "cifsd-team"; repo = pname; rev = version; - sha256 = "sha256-sSCLXNdVUAdk+GnFlVx/BsAzyfz0KDdugJ1isrOztgs="; + sha256 = "sha256-zquHhr+Zf4jR/TlVA0Zea3eZ9JjRjYXefcYIQs76gSw="; }; buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5; diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix index 43c9bf74e3f..683448cbe41 100644 --- a/pkgs/os-specific/linux/libpsm2/default.nix +++ b/pkgs/os-specific/linux/libpsm2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libpsm2"; - version = "11.2.229"; + version = "11.2.230"; preConfigure= '' export UDEVDIR=$out/etc/udev @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "opa-psm2"; rev = "PSM2_${version}"; - sha256 = "sha256-t3tZCxGmGMscDmeyCATLbHxU7jEJqAzxwPV0Z8pl2ko="; + sha256 = "sha256-dMfGq067TqstGAWNSZZaZCwvChTyPUsvaPVjFGGzp64="; }; postInstall = '' diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 46d0e94bb14..2049b7cf0e7 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, help2man, gettext -, libxml2, perl, python3, doxygen }: - +{ lib, stdenv, fetchFromGitHub, fetchurl +, pkg-config, autoreconfHook, help2man, gettext, libxml2, perl, python3, doxygen +}: stdenv.mkDerivation rec { pname = "libsmbios"; @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"; }; + patches = [ + (fetchurl { + name = "musl.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/libsmbios/fixes.patch?id=bdc4f67889c958c1266fa5d0cab71c3cd639122f"; + sha256 = "aVVc52OovDYvqWRyKcRAi62daa9AalkKvnVOGvrTmRk="; + }) + ]; + nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkg-config ]; buildInputs = [ python3 ]; diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index c81949bf39a..427f2eb69c4 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; sha256 = "sha256-iLy2rEKn0UJguRcY/W8RvUq7uX+snQojb/cXOmMsjwc="; }; diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index 46a633aec55..3cb79ae0778 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.5.0"; + version = "1.6.4"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; rev = "libtracefs-${version}"; - sha256 = "sha256-5OUTOIla4adtSJwQkii6f/mB99R5QzodyQkq/g6oNSw="; + sha256 = "sha256-fWop0EMkoVulLBzU7q8x1IhMtdnEJ89wMz0cz964F6s="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 756e1352635..3a69923aca8 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,41 +1,16 @@ -{ lib, stdenv, fetchgit, fetchpatch, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { pname = "lttng-modules-${kernel.version}"; - version = "2.13.4"; + version = "2.13.8"; - src = fetchgit { - url = "https://git.lttng.org/lttng-modules.git"; + src = fetchFromGitHub { + owner = "lttng"; + repo = "lttng-modules"; rev = "v${version}"; - hash = "sha256-J2Tr1vOiCAilmnf3attF3bz8Irn9IQ2QbapdXJ4MUSg="; + hash = "sha256-6ohWsGUGFz7QlHkKWyW5edpSsBTE9DFS3v6EsH9wNZo="; }; - patches = [ - # fix: mm/page_alloc: fix tracepoint mm_page_alloc_zone_locked() (v5.19) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=6229bbaa423832f6b7c7a658ad11e1d4242752ff"; - hash = "sha256-pqbKxBzjfN20wfsqSeBLXNQ+/U+3qk9RfTiT32OwSIc="; - }) - - # fix: fs: Remove flags parameter from aops->write_begin (v5.19) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=5e2f832d59d51589ab69479c7db43c7581fb9346"; - hash = "sha256-auoCbvFEVR76sOCLjIe+q/Q+vunQlR3G3gVcjqAGGPk="; - }) - - # fix: workqueue: Fix type of cpu in trace event (v5.19) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=c6da9604b1666780ea4725b3b3d1bfa1548f9c89"; - hash = "sha256-qoTwy+P32qg1L+JctqM1+70OkeTbnbL3QJ9LwaBq/bw="; - }) - - # fix: net: skb: introduce kfree_skb_reason() (v5.15.58..v5.16) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=96c477dabaaf6cd1734bebe0972fef877e5a463b"; - hash = "sha256-b7BhrYZ5SZqeRVGEu0Eo9GfbcZdDPrgEnOl2XU3z+ds="; - }) - ]; - nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -57,6 +32,6 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl21Only gpl2Only mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - broken = (lib.versions.majorMinor kernel.modDirVersion) == "5.10"; + broken = (lib.versions.majorMinor kernel.modDirVersion) == "5.10" || (lib.versions.majorMinor kernel.modDirVersion) == "5.4"; }; } diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 2f48448541b..5a5193997be 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.17"; - hash = "sha256-cobPqWUYKMWJOJUJVGMzuNqWXfqEoaTIqz5oGkf6uuc="; + version = "2.03.18"; + hash = "sha256-n2g+KYDZXA3Ou9JcfBdwMsVhXXJnv8iF6r/OWSgPR2k="; } diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index c28c55091ef..925901d2267 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "unstable-2022-09-27"; + version = "unstable-2022-11-09"; src = fetchzip rec { url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz"; - passthru.rev = "dfc3b6ecda84d21418fb4408b39c5c71db4c6458"; - sha256 = "G4sBwRW8NOq7CGTADvXgMbcVInStSueGfGsb4ApVaSk="; + passthru.rev = "c62dd8e415b12cc7f9a362db23cd384caf77ff03"; + sha256 = "zTrMounPmos+9Reyfa3xS5/5/tyMs0WapSmzqdXUBNk="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index f1b129e8040..91363969ffe 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, coreutils , pkg-config , perl , lvm2 @@ -9,31 +10,28 @@ , systemd , liburcu , json_c -, kmod +, linuxHeaders , cmocka , nixosTests }: stdenv.mkDerivation rec { pname = "multipath-tools"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "opensvc"; repo = "multipath-tools"; rev = "refs/tags/${version}"; - sha256 = "sha256-pIGeZ+jB+6GqkfVN83axHIuY/BobQ+zs+tH+MkLIln0="; + sha256 = "sha256-CPvtnjzkyxKXrT8+YXaIgDA548h8X61+jCxMHKFfEyg="; }; postPatch = '' - substituteInPlace libmultipath/Makefile \ - --replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h + substituteInPlace create-config.mk \ + --replace /bin/echo ${coreutils}/bin/echo - # systemd-udev-settle.service is deprecated. substituteInPlace multipathd/multipathd.service \ - --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \ - --replace /sbin/multipathd "$out/bin/multipathd" \ - --replace " systemd-udev-settle.service" "" + --replace /sbin/multipathd "$out/bin/multipathd" sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", @@ -45,15 +43,16 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ systemd lvm2 libaio readline liburcu json_c ]; + buildInputs = [ systemd lvm2 libaio readline liburcu json_c linuxHeaders ]; makeFlags = [ "LIB=lib" "prefix=$(out)" + "systemd_prefix=$(out)" + "kernel_incdir=${linuxHeaders}/include/" "man8dir=$(out)/share/man/man8" "man5dir=$(out)/share/man/man5" "man3dir=$(out)/share/man/man3" - "SYSTEMDPATH=lib" ]; doCheck = true; diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index b0b155c784a..f90da9db3bf 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -157,10 +157,6 @@ if [[ -n "$SUDO_USER" || -n $remoteSudo ]]; then maybeSudo=(sudo --preserve-env="$preservedSudoVars" --) fi -if [[ -z "$buildHost" && -n "$targetHost" ]]; then - buildHost="$targetHost" -fi - # log the given argument to stderr if verbose mode is on logVerbose() { if [ -n "$verboseScript" ]; then diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 02111abb4d0..df9aca8e246 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -51,14 +51,14 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "525.47.04"; - persistencedVersion = "525.78.01"; - settingsVersion = "525.78.01"; - sha256_64bit = "sha256-PcDRM39s4vh5++4TocIJKI3wsxWxJdy3p3KAenpdIc0="; - openSha256 = "sha256-jH7mwSpasOdWMvN1xuPkO33g0XJjObzA45aqHwKoD4w="; - settingsSha256 = "sha256-1d3Cn+7Gm1ORQxmTKr18GFmYHVb8t050XVLler1dCtw="; - persistencedSha256 = "sha256-t6dViuvA2fw28w4kh4koIoxh9pQ8f7KI1PIUFJcGlYA="; - url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; + version = "525.47.06"; + persistencedVersion = "525.85.05"; + settingsVersion = "525.85.05"; + sha256_64bit = "sha256-HxRXtd3ubjS1V/y1hDWe16XNSCbQYHoEw+Jz8Emy5/4="; + openSha256 = "sha256-oiOlCdkFMXm4vVZzmnnI5/INVWUqC02gGj/aIfzjGig="; + settingsSha256 = "sha256-ck6ra8y8nn5kA3L9/VcRR2W2RaWvfVbgBiOh2dRJr/8="; + persistencedSha256 = "sha256-dt/Tqxp7ZfnbLel9BavjWDoEdLJvdJRwFjTFOBYYKLI="; + url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; }; # Update note: diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index bd81715bdac..1c1edc5abce 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; - sha256 = "sha256-pNU5isAZh9cPgaWZSSvWmSqukKV3TFGGntOKN6y1zIo="; + sha256 = "sha256-EINi0pZo0lz3sMrcY7FaTBz8DbxxrcFRszxf597Ok5o="; }; strictDeps = true; diff --git a/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix b/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix new file mode 100644 index 00000000000..4a651bf473e --- /dev/null +++ b/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl }: + +## Usage +# In NixOS, simply add this package to services.udev.packages: +# services.udev.packages = [ pkgs.picoprobe-udev-rules ]; + +stdenv.mkDerivation rec { + pname = "picoprobe-udev-rules"; + version = "unstable-2023-01-31"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/probe-rs/webpage/1cba61acc6ecb5ff96f74641269844ad88ad8ad5/static/files/69-probe-rs.rules"; + sha256 = "sha256-vQMPX3Amttja0u03KWGnPDAVTGM9ekJ+IBTjW+xlJS0="; + }; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -D $src $out/lib/udev/rules.d/69-probe-rs.rules + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://probe.rs/docs/getting-started/probe-setup/#udev-rules"; + description = "Picoprobe udev rules list"; + platforms = platforms.linux; + license = licenses.gpl2Only; + maintainers = with maintainers; [ mglolenstine ]; + }; +} diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 86f2e124ed2..5f03c5faabc 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.02.27"; + version = "0.03.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-P6DhsHnB+ak35JpUfD8Q8XbgMhI1QKKe31B8uMT2ZcY="; + hash = "sha256-eiFzWKY4LrudfjMKDk4clmvCqYOGvWFokn6jEryMYBo="; }; installFlags = [ diff --git a/pkgs/os-specific/linux/rasdaemon/default.nix b/pkgs/os-specific/linux/rasdaemon/default.nix index cccd91fff8e..35201d49b7f 100644 --- a/pkgs/os-specific/linux/rasdaemon/default.nix +++ b/pkgs/os-specific/linux/rasdaemon/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rasdaemon"; - version = "0.6.8"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mchehab"; repo = "rasdaemon"; rev = "v${version}"; - sha256 = "sha256-gcwoc9lIJyqUiCSAHf1U8geLG58CxzjMFYFl8moaA2Q="; + sha256 = "sha256-oLwR+bNgKceVgLTOLYiKHNUkRmLouaQshdp/8UJnfqg="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index f53ed777d08..e50129f1e2b 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8189es-${kernel.version}-${version}"; - version = "2022-08-30"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "jwrdegoede"; repo = "rtl8189ES_linux"; - rev = "c93cfd712a3acd2ecdeda19a66d269c20f8803f1"; - sha256 = "sha256-bBUxo8lplFwXfsSNf5lz9XCpQ6M0vWelmFoCal95FpI="; + rev = "e58bd86c9d9408c648b1246a0dd76b16856ec172"; + sha256 = "sha256-KKly72N6ACBTB4CSBM6Q/S1wGMTg5NZA3QYslYPNUr8="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/rtl8189fs/default.nix b/pkgs/os-specific/linux/rtl8189fs/default.nix index 0a385d0ca39..589408a302b 100644 --- a/pkgs/os-specific/linux/rtl8189fs/default.nix +++ b/pkgs/os-specific/linux/rtl8189fs/default.nix @@ -3,22 +3,15 @@ # rtl8189fs is a branch of the rtl8189es driver rtl8189es.overrideAttrs (drv: rec { name = "rtl8189fs-${kernel.version}-${version}"; - version = "2022-05-20"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "jwrdegoede"; repo = "rtl8189ES_linux"; - rev = "71500c28164369800041d1716ac513457179ce93"; - sha256 = "sha256-JTv+ssSv5toNcZ5wR6p0Cywdk87z9Bdq0ftU0ekr/98="; + rev = "e58bd86c9d9408c648b1246a0dd76b16856ec172"; + sha256 = "sha256-KKly72N6ACBTB4CSBM6Q/S1wGMTg5NZA3QYslYPNUr8="; }; - patches = [ - (fetchpatch { - url = "https://github.com/jwrdegoede/rtl8189ES_linux/pull/81.patch"; - sha256 = "sha256-ovFQBIHLk3wi2uwAyr8VmdbuhPcoHsZ/lpA66obVBK4="; - }) - ]; - meta = with lib; { description = "Driver for Realtek rtl8189fs"; homepage = "https://github.com/jwrdegoede/rtl8189ES_linux/tree/rtl8189fs"; diff --git a/pkgs/os-specific/linux/rtl8723ds/default.nix b/pkgs/os-specific/linux/rtl8723ds/default.nix index a732d1c5d8e..4aa408eec41 100644 --- a/pkgs/os-specific/linux/rtl8723ds/default.nix +++ b/pkgs/os-specific/linux/rtl8723ds/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8723ds"; - version = "${kernel.version}-unstable-2022-10-20"; + version = "${kernel.version}-unstable-2022-12-01"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtl8723ds"; - rev = "912fdb30531bc8c071267a047e7df16feae7a865"; - sha256 = "sha256-HhoCKrrRg1Q995sekQvzhaiqANeTP8pANItj2vLV+Cw="; + rev = "a638cc8639015b8b9390af3350fab0366b6c87e7"; + sha256 = "sha256-qfVE7k71NPzw3FwoOaUxH66PnDjbpMAF6CyOyUVdSMA="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 6a1c4fc80da..84ad6a314e1 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl8812au"; - version = "${kernel.version}-unstable-2022-08-22"; + version = "${kernel.version}-unstable-2023-01-17"; src = fetchFromGitHub { owner = "morrownr"; repo = "8812au-20210629"; - rev = "7aa0e0c74551b4e4f319f4b54e00ccbfe588b7ce"; - sha256 = "sha256-BHC1DpWHv/1UvSfj6S5fo/ODZ1VDgLQO2A9EC+BR1JE="; + rev = "0a8bb3cec3ef91e6ef8cf549ca926016ba0a8acd"; + sha256 = "sha256-25NaMQq9H6mqVynNQJXpqISAslxfEVSt3ELzG7s4mV4="; }; nativeBuildInputs = [ bc nukeReferences ]; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index 5e4b764431f..dd0b32c5380 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8814au"; - version = "${kernel.version}-unstable-2022-08-18"; + version = "${kernel.version}-unstable-2022-11-09"; src = fetchFromGitHub { owner = "morrownr"; repo = "8814au"; - rev = "752d8ea365b2affc5d356e35659600995508849d"; - hash = "sha256-m79IVoD3xFigmax13qELx5e3v0NfJSwmmC0PatA91HI="; + rev = "932df6f7da6c3a384cf91f33eb195097eb0cb6c5"; + hash = "sha256-nMQiT59IIhzpePWWDiyCQFmYLWM42L/mG0BKsbEwreo="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 0e80a70fd57..674af264c39 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,25 +1,19 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , kernel , bc }: stdenv.mkDerivation rec { pname = "rtl8821ce"; - version = "${kernel.version}-unstable-2022-06-01"; + version = "${kernel.version}-unstable-2023-01-01"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "be733dc86781c68571650b395dd0fa6b53c0a039"; - sha256 = "sha256-4PgISOjCSSGymz96VwE4jzcUiOEO+Ocuk2kJVIA+TQM="; - }; - - patches = fetchpatch { - url = "https://github.com/tomaspinho/rtl8821ce/pull/291.patch"; - sha256 = "sha256-GCZ/iPtzF7PP0ZgagBev6r7IVQ2VenPoLKL9GnPSt+U="; + rev = "a3e2f7c1f91e92f2dc788e8fcd7f2986af3d19b6"; + sha256 = "sha256-eR4iTkRMnhNEBrUEC+fKlwq3hezNC9mSAQ7D0Wwss/0="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index de5c79a5601..80c14a0b383 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, kernel }: let - rev = "37e27f9165300c89607144b646545fac576ec510"; + rev = "ee299797bcd54d5b8c58d2da8576c54cea1a03a2"; in stdenv.mkDerivation rec { pname = "rtl88xxau-aircrack"; @@ -11,15 +11,13 @@ stdenv.mkDerivation rec { owner = "aircrack-ng"; repo = "rtl8812au"; inherit rev; - sha256 = "sha256-TpmpueKAaCe7Nlmv8pMvgMXGVmXVa/1mBwtEoy4JyCY="; + sha256 = "sha256-JUyUOqLMD9nSo6i87K/6Ljp+pWSqSBz/IZiFWu03rQw="; }; buildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; - NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; - prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ @@ -40,6 +38,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.jethro ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; - broken = kernel.kernelAtLeast "5.18"; }; } diff --git a/pkgs/os-specific/linux/ryzenadj/default.nix b/pkgs/os-specific/linux/ryzenadj/default.nix index b533643752a..0af52023b23 100644 --- a/pkgs/os-specific/linux/ryzenadj/default.nix +++ b/pkgs/os-specific/linux/ryzenadj/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pciutils, cmake }: stdenv.mkDerivation rec { pname = "ryzenadj"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "FlyGoat"; repo = "RyzenAdj"; rev = "v${version}"; - sha256 = "sha256-tfki+7W2RbqzEHG/Ibton/V5koT89emdQ7aX8WDUzdI="; + sha256 = "sha256-otw2U3Qh6NR6lJU1ldMR6Y5ia4Qk5tHAe/oY0YxJQUg="; }; nativeBuildInputs = [ pciutils cmake ]; diff --git a/pkgs/os-specific/linux/sasutils/default.nix b/pkgs/os-specific/linux/sasutils/default.nix index fd1a6f0b049..743a3ed9554 100644 --- a/pkgs/os-specific/linux/sasutils/default.nix +++ b/pkgs/os-specific/linux/sasutils/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "sasutils"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "stanford-rc"; repo = pname; - rev = "v${version}"; - sha256 = "0kh5pcc2shdmrvqqi2y1zamzsfvk56pqgwqgqhjfz4r6yfpm04wl"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cPCmmJkhr4+STVHa7e3LZGZFd8KPkECMAVurhuG8H1s="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/os-specific/linux/sgx/psw/default.nix b/pkgs/os-specific/linux/sgx/psw/default.nix index ba2d0967e45..4a5e50d9c6a 100644 --- a/pkgs/os-specific/linux/sgx/psw/default.nix +++ b/pkgs/os-specific/linux/sgx/psw/default.nix @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { # NixOS module which is based on those files without relying on them. Still, it # is helpful to have properly patched versions for non-NixOS distributions. postFixup = '' - header "Fixing aesmd.service" + echo "Fixing aesmd.service" substituteInPlace $out/lib/systemd/system/aesmd.service \ --replace '@aesm_folder@' \ "$out/aesm" \ @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { --replace "/bin/kill" \ "${coreutils}/bin/kill" - header "Fixing remount-dev-exec.service" + echo "Fixing remount-dev-exec.service" substituteInPlace $out/lib/systemd/system/remount-dev-exec.service \ --replace '/bin/mount' \ "${util-linux}/bin/mount" diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix index 5213dc1e4fd..053aaecbcbb 100644 --- a/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { }; in '' - header "Setting up IPP crypto build artifacts" + echo "Setting up IPP crypto build artifacts" pushd 'external/ippcp_internal' @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { ./linux/installer/bin/sgx_linux_x64_sdk_${version}.bin -prefix $installDir installDir=$installDir/sgxsdk - header "Move files created by installer" + echo "Move files created by installer" mkdir -p $out/bin pushd $out @@ -206,15 +206,15 @@ stdenv.mkDerivation rec { preFixup = '' - header "Strip sgxsdk prefix" + echo "Strip sgxsdk prefix" for path in "$out/share/bin/environment" "$out/bin/sgx-gdb"; do substituteInPlace $path --replace "$TMPDIR/sgxsdk" "$out" done - header "Fixing pkg-config files" + echo "Fixing pkg-config files" sed -i "s|prefix=.*|prefix=$out|g" $out/lib/pkgconfig/*.pc - header "Fixing SGX_SDK default in samples" + echo "Fixing SGX_SDK default in samples" substituteInPlace $out/share/SampleCode/LocalAttestation/buildenv.mk \ --replace '/opt/intel/sgxsdk' "$out" for file in $out/share/SampleCode/*/Makefile; do @@ -222,12 +222,12 @@ stdenv.mkDerivation rec { --replace '/opt/intel/sgxsdk' "$out" done - header "Fixing BINUTILS_DIR in buildenv.mk" + echo "Fixing BINUTILS_DIR in buildenv.mk" substituteInPlace $out/share/bin/buildenv.mk \ --replace 'BINUTILS_DIR ?= /usr/local/bin' \ 'BINUTILS_DIR ?= ${BINUTILS_DIR}' - header "Fixing GDB path in bin/sgx-gdb" + echo "Fixing GDB path in bin/sgx-gdb" substituteInPlace $out/bin/sgx-gdb --replace '/usr/local/bin/gdb' '${gdb}/bin/gdb' ''; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index efd2078d99a..e9ee3c518fe 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "sssd"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "SSSD"; repo = pname; rev = version; - sha256 = "sha256-TbeofUQAQNM/Nxzgl8GP2+Y4iR7bVXm4dQaPkYMSdqc="; + sha256 = "sha256-nEMfwOvWd3FRk+1RS1NPT+LcfWi4lDLCGYqH7KuPw7o="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 21f232d0c2d..a8579a50fb6 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config , luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc -, libyamlcpp, nlohmann_json, re2 +, yaml-cpp, nlohmann_json, re2 }: -with lib; let # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake libsRev = "0.9.1"; @@ -51,10 +50,10 @@ stdenv.mkDerivation rec { re2 protobuf grpc - libyamlcpp + yaml-cpp jsoncpp nlohmann_json - ] ++ optionals (kernel != null) kernel.moduleBuildDependencies; + ] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -82,7 +81,7 @@ stdenv.mkDerivation rec { "-DUSE_BUNDLED_TBB=OFF" "-DUSE_BUNDLED_RE2=OFF" "-DCREATE_TEST_TARGETS=OFF" - ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; + ] ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF"; # needed since luajit-2.1.0-beta3 NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))"; @@ -93,7 +92,7 @@ stdenv.mkDerivation rec { exit 1 fi cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -labsl_synchronization") - '' + optionalString (kernel != null) '' + '' + lib.optionalString (kernel != null) '' export INSTALL_MOD_PATH="$out" export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ''; @@ -106,7 +105,7 @@ stdenv.mkDerivation rec { rmdir $out/etc/bash_completion.d rmdir $out/etc '' - + optionalString (kernel != null) '' + + lib.optionalString (kernel != null) '' make install_driver kernel_dev=${kernel.dev} kernel_dev=''${kernel_dev#/nix/store/} @@ -121,7 +120,7 @@ stdenv.mkDerivation rec { ''; - meta = { + meta = with lib; { description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; license = with licenses; [ asl20 gpl2 mit ]; maintainers = [maintainers.raskin]; diff --git a/pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch b/pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch new file mode 100644 index 00000000000..c64fdd8d34c --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch @@ -0,0 +1,44 @@ +From 236e9281cb158be3191c500524fbc5f397a25e03 Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Sun, 15 Jan 2023 20:15:55 +0800 +Subject: [PATCH] tpm2_context_init: fix driver name checking + +https://github.com/systemd/systemd/commit/542dbc623e introduced +additional checks for tpm2 driver names, namely ensuring the driver +name, when concated with "libtss2-tcti-" and ".so.0", generates a valid +filename (with no '/' inside). + +For example, if the driver is name "device", the line + fn = strjoina("libtss2-tcti-", driver, ".so.0") +would yield "libtss2-tcti-device.so.0", passing the check. And the +filename is then passed to dlopen for loading the driver. + +Our current approach for systemd to correctly locate these dynamically +loaded libraries is to patch the filenames to include their absolute +path. Thus the line mentioned above is patched into + fn = strjoina("/nix/store/xxxxxxx-tpm2-tss-3.2.0/lib/libtss2-tcti-", driver, ".so.0") +yielding "/nix/store/xxxxxxx-tpm2-tss-3.2.0/lib/libtss2-tcti-device.so.0", +tripping the check. + +This patch relaxes the check to also accept absolute paths, by replacing +filename_is_valid with path_is_valid. +--- + src/shared/tpm2-util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c +index ba8dfb041d..7de5d5fc77 100644 +--- a/src/shared/tpm2-util.c ++++ b/src/shared/tpm2-util.c +@@ -192,7 +192,7 @@ int tpm2_context_init(const char *device, struct tpm2_context *ret) { + fn = strjoina("libtss2-tcti-", driver, ".so.0"); + + /* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */ +- if (!filename_is_valid(fn)) ++ if (!path_is_valid(fn)) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "TPM2 driver name '%s' not valid, refusing.", driver); + + dl = dlopen(fn, RTLD_NOW); +-- +2.39.0 + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fadb6a486c8..e871d6618c3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -93,6 +93,7 @@ , withHwdb ? true , withImportd ? !stdenv.hostPlatform.isMusl , withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" + && stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6" # assumes hard floats && !stdenv.hostPlatform.isMips64 # see https://github.com/NixOS/nixpkgs/pull/194149#issuecomment-1266642211 , withLocaled ? true , withLogind ? true @@ -174,6 +175,7 @@ stdenv.mkDerivation { ./0016-pkg-config-derive-prefix-from-prefix.patch ./0017-inherit-systemd-environment-when-calling-generators.patch ./0018-core-don-t-taint-on-unmerged-usr.patch + ./0019-tpm2_context_init-fix-driver-name-checking.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { @@ -714,7 +716,7 @@ stdenv.mkDerivation { description = "A system and service manager for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; - badPlatforms = [ (plat: plat.isStatic) ]; + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 broken = stdenv.hostPlatform.isStatic; priority = 10; diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 0aff1bdd789..6b349e70656 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,18 +1,19 @@ { lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }: stdenv.mkDerivation rec { pname = "trace-cmd"; - version = "3.1.2"; + version = "3.1.6"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; + url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; rev = "trace-cmd-v${version}"; - sha256 = "sha256-wxrMEE7ZgMHM59Rv6Gk3f0zdpULuXLnY0UY797YF1a0="; + sha256 = "sha256-qjfeomeExjsx/6XrUaGm5szbL7XVlekGd4Hsuncv8NY="; }; # Don't build and install html documentation postPatch = '' sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' \ Documentation{,/trace-cmd,/libtracecmd}/Makefile + patchShebangs check-manpages.sh ''; nativeBuildInputs = [ asciidoc libxslt pkg-config xmlto docbook_xsl docbook_xml_dtd_45 sourceHighlight ]; diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix index ccf462702fd..d18818a10de 100644 --- a/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "virtio_vmmci"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "voutilad"; repo = "virtio_vmmci"; rev = "${version}"; - sha256 = "104xnpcy5kb4y7ipy1fx1v6byddzs63bv2dqjy3yl23n764fsy43"; + hash = "sha256-ZHslYYZFjM3wp0W5J3/WwCtQ2wDzT1jNc26Z/giTC8g="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/vmm_clock/default.nix b/pkgs/os-specific/linux/vmm_clock/default.nix index 853e7765ee2..1a10df62d46 100644 --- a/pkgs/os-specific/linux/vmm_clock/default.nix +++ b/pkgs/os-specific/linux/vmm_clock/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "vmm_clock"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "voutilad"; repo = "vmm_clock"; rev = "${version}"; - sha256 = "0hg7ywznh6v11fywsz6f7w298bxph0wwm046zqaqncjvr4aizla4"; + hash = "sha256-8z/N/dbkeFd40sH7jatNmSS62B88tC0jVgNljhxslOo="; }; hardeningDisable = [ "pic" "format" ]; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = kernel.kernelOlder "4.19"; description = "Experimental implementation of a kvmclock-derived clocksource for Linux guests under OpenBSD's hypervisor"; homepage = "https://github.com/voutilad/vmm_clock"; diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index efa21cfb26b..8955bcfa512 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -4,12 +4,15 @@ , dnsmasq , gawk , getent +, gobject-introspection +, gtk3 , kmod , lxc , iproute2 , nftables , util-linux , which +, wrapGAppsHook , xclip }: @@ -25,6 +28,15 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-0GBob9BUwiE5cFGdK8AdwsTjTOdc+AIWqUGN/gFfOqI="; }; + buildInputs = [ + gtk3 + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + propagatedBuildInputs = with python3Packages; [ gbinder-python pyclip @@ -35,9 +47,14 @@ python3Packages.buildPythonApplication rec { dontUsePipInstall = true; dontUseSetuptoolsCheck = true; dontWrapPythonPrograms = true; + dontWrapGApps = true; installPhase = '' make install PREFIX=$out USE_SYSTEMD=0 USE_NFTABLES=1 + ''; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \ --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 nftables ]} diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 2d954d83ecf..ba4fe8356ce 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, openssl, pkg-config, libnl , nixosTests, wpa_supplicant_gui -, dbusSupport ? true, dbus +, dbusSupport ? !stdenv.hostPlatform.isStatic, dbus , withReadline ? true, readline -, withPcsclite ? true, pcsclite +, withPcsclite ? !stdenv.hostPlatform.isStatic, pcsclite , readOnlyModeSSIDs ? false }: @@ -73,6 +73,15 @@ stdenv.mkDerivation rec { CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_INTRO=y + '' + # Upstream uses conditionals based on ifdef, so opposite of =y is + # not =n, as one may expect, but undefine. + # + # This config is sourced into makefile. + + optionalString (!dbusSupport) '' + undefine CONFIG_CTRL_IFACE_DBUS + undefine CONFIG_CTRL_IFACE_DBUS_NEW + undefine CONFIG_CTRL_IFACE_DBUS_INTRO '' + (if withReadline then '' CONFIG_READLINE=y '' else '' @@ -104,13 +113,15 @@ stdenv.mkDerivation rec { mkdir -p $out/share/man/man5 $out/share/man/man8 cp -v "doc/docbook/"*.5 $out/share/man/man5/ cp -v "doc/docbook/"*.8 $out/share/man/man8/ - + '' + + lib.optionalString dbusSupport '' mkdir -p $out/share/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system cp -v "dbus/"*service $out/share/dbus-1/system-services sed -e "s@/sbin/wpa_supplicant@$out&@" -i "$out/share/dbus-1/system-services/"* cp -v dbus/dbus-wpa_supplicant.conf $out/share/dbus-1/system.d cp -v "systemd/"*.service $out/etc/systemd/system - + '' + + '' rm $out/share/man/man8/wpa_priv.8 install -Dm444 wpa_supplicant.conf $out/share/doc/wpa_supplicant/wpa_supplicant.conf.example ''; diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix index 1ba01a1c88f..7a4facebcee 100644 --- a/pkgs/os-specific/linux/zenpower/default.nix +++ b/pkgs/os-specific/linux/zenpower/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, kernel, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, kernel, fetchFromGitea }: stdenv.mkDerivation rec { pname = "zenpower"; - version = "unstable-2022-04-13"; + version = "unstable-2022-11-04"; - src = fetchFromGitHub { - owner = "Ta180m"; + src = fetchFromGitea { + domain = "git.exozy.me"; + owner = "a"; repo = "zenpower3"; - rev = "c36a86c64b802e9b90b5166caee6a8e8eddaeb56"; - sha256 = "1i9ap7xgab421f3c68mcmad25xs4h8pfz0g0f9yzg7hxpmb0npxi"; + rev = "c176fdb0d5bcba6ba2aba99ea36812e40f47751f"; + sha256 = "sha256-d2WH8Zv7F0phZmEKcDiaak9On+Mo9bAFhMulT/N5FWI="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index af13f856027..f3fa6a11987 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_6_0 ? pkgs.linuxKernel.packages.linux_6_0 +, linuxPackages_6_1 ? pkgs.linuxKernel.packages.linux_6_1 }: let @@ -222,28 +222,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.1"; - latestCompatibleLinuxPackages = linuxPackages_6_0; + kernelCompatible = kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = linuxPackages_6_1; # this package should point to the latest release. - version = "2.1.7"; + version = "2.1.9"; - sha256 = "sha256-vLm6RE11nqOCoYXne79JU3nUQnVEUNbwrULwFfghWcI="; + sha256 = "RT2ijcXhdw5rbz1niDjrqg6G/uOjyrJiTlS4qijiWqc="; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.1"; - latestCompatibleLinuxPackages = linuxPackages_6_0; + kernelCompatible = kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = linuxPackages_6_1; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs-<version>-staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.8-staging-2023-01-10"; - rev = "0156253d29a303bdcca3e535958e754d8f086e33"; + version = "2.1.10-staging-2023-01-24"; + rev = "92e0d9d183ce6752cd52f7277c8321d81df9ffee"; - sha256 = "sha256-2+vymBesmNLB3fuaCwQOojEzn3aYqtxIo35MvlwOoNw="; + sha256 = "RT2ijcXhdw5rbz1niDjrqg6G/uOjyrJiTlS4qijiWqc="; isUnstable = true; }; |