diff options
Diffstat (limited to 'pkgs/os-specific/linux')
87 files changed, 551 insertions, 754 deletions
diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index 9591d4ef4cca..ce21887f19f8 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "915resolution-0.5.3"; - + src = fetchurl { url = "http://915resolution.mango-lang.org/${name}.tar.gz"; sha256 = "0hmmy4kkz3x6yigz6hk99416ybznd67dpjaxap50nhay9f1snk5n"; @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = http://915resolution.mango-lang.org/; description = "A tool to modify Intel 800/900 video BIOS"; platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.publicDomain; }; } diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index fb312b6bcb00..53fcf7d68433 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0gfcyj5anckjn030wcxx5v2xk2s219nyf99s9m833275b5wz2piw"; }; - configureFlags = '' - --with-hotplug-dir=$(out)/lib/firmware - ''; + configureFlags = [ + "--with-hotplug-dir=$(out)/lib/firmware" + ]; dontStrip = true; diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index a13e178e4183..2b8ef40461d0 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -11,15 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib ncurses libsamplerate ]; nativeBuildInputs = [ gettext ]; - configureFlags = "--disable-xmlto"; + configureFlags = [ "--disable-xmlto" ]; installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; - preConfigure = - '' - ''; - - meta = { + meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; description = "ALSA, the Advanced Linux Sound Architecture alsa-oss emulation"; @@ -28,6 +24,7 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 1ce94d14803c..8faba250fb3e 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; description = "ALSA, the Advanced Linux Sound Architecture tools"; @@ -47,7 +47,8 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.fps ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.fps ]; }; } diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 376c42a8f9b8..60e3b9750d71 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext ]; buildInputs = [ alsaLib ncurses libsamplerate fftw ]; - configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d"; + configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; - meta = { + meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; description = "ALSA, the Advanced Linux Sound Architecture utils"; longDescription = '' @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.AndersonTorres ]; }; } diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index cbbe4d5ca462..08428f95b06c 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -2,9 +2,9 @@ , pkgconfig, which , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders -, python , gawk -, perl +, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform && perl.meta.available or false, perl +, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && python.meta.available or false, python , swig , ncurses , pam @@ -76,10 +76,9 @@ let perl ]; - buildInputs = stdenv.lib.optionals (!stdenv.isCross) [ - perl - python - ]; + buildInputs = [] + ++ stdenv.lib.optional withPerl perl + ++ stdenv.lib.optional withPython python; # required to build apparmor-parser dontDisableStatic = true; @@ -92,11 +91,14 @@ let postPatch = "cd ./libraries/libapparmor"; # https://gitlab.com/apparmor/apparmor/issues/1 - configureFlags = stdenv.lib.optionalString (!stdenv.isCross) "--with-python --with-perl"; + configureFlags = [ + (stdenv.lib.withFeature withPerl "perl") + (stdenv.lib.withFeature withPython "python") + ]; - outputs = if stdenv.isCross then [ "out" ] else [ "out" "python" ]; + outputs = [ "out" ] ++ stdenv.lib.optional withPython "python"; - postInstall = stdenv.lib.optionalString (!stdenv.isCross) '' + postInstall = stdenv.lib.optionalString withPython '' mkdir -p $python/lib mv $out/lib/python* $python/lib/ ''; @@ -137,7 +139,9 @@ let inherit doCheck; - meta = apparmor-meta "user-land utilities"; + meta = apparmor-meta "user-land utilities" // { + broken = !(withPython && withPerl); + }; }; apparmor-bin-utils = stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 7b4ac9e1f3b8..739342b77fda 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -33,15 +33,16 @@ stdenv.mkDerivation rec { make systemdinstall $makeFlags ''; - meta = { - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [raskin]; + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = with maintainers; [ raskin ]; description = ''Console system performance monitor''; longDescription = '' Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. ''; inherit version; + license = licenses.gpl2; downloadPage = http://atoptool.nl/downloadatop.php; }; } diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 2796fed17dc6..a02127ab7989 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -4,14 +4,14 @@ }: python.pkgs.buildPythonApplication rec { - version = "0.6.0"; + version = "0.6.1"; name = "bcc-${version}"; src = fetchFromGitHub { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "1fk2kvbdvm87rkha2cigz2qhhlrni4g0dcnmiiyya79y85ahfvga"; + sha256 = "1rfqjbq8ah8zrsnpbx0h5irq3h2snncfvi4pvaxl7574kciprjxj"; }; format = "other"; diff --git a/pkgs/os-specific/linux/beegfs/kernel-module.nix b/pkgs/os-specific/linux/beegfs/kernel-module.nix index eff0e741e616..286252b927b1 100644 --- a/pkgs/os-specific/linux/beegfs/kernel-module.nix +++ b/pkgs/os-specific/linux/beegfs/kernel-module.nix @@ -41,5 +41,6 @@ in stdenv.mkDerivation { platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl2; maintainers = with maintainers; [ markuskowa ]; + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index b095096caa76..3882a7425869 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, - pythonPackages, readline, udev, libical, + python3, readline, udev, libical, systemd, enableWiimote ? false, enableMidi ? false }: stdenv.mkDerivation rec { @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z"; }; - pythonPath = with pythonPackages; [ + pythonPath = with python3.pkgs; [ dbus-python pygobject2 pygobject3 recursivePthLoader ]; buildInputs = [ - dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython + dbus glib alsaLib python3 python3.pkgs.wrapPython readline udev libical ]; diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index 83c442618b8e..9c2692b037ef 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, - python, boost, fuse, libtorrentRasterbar, curl }: + python3, boost, fuse, libtorrentRasterbar, curl }: stdenv.mkDerivation rec { name = "btfs-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preInstall = '' substituteInPlace scripts/btplay \ - --replace "/usr/bin/env python" "${python}/bin/python" + --replace "/usr/bin/env python" "${python3.interpreter}" ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index a8ffb133a905..6c927ae93afb 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, findutils, binutils, glibc, coreutils, sysctl }: +{ stdenv, fetchurl, file, findutils, binutils-unwrapped, glibc, coreutils, sysctl }: stdenv.mkDerivation rec { name = "checksec-${version}"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $" substituteInPlace $out/bin/checksec --replace "xargs file" "xargs ${file}/bin/file" - substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils.out}/bin/readelf -" - substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils.out}/bin/readelf -" - substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils.out}/bin/readelf" + substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils-unwrapped}/bin/readelf -" + substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils-unwrapped}/bin/readelf -" + substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils-unwrapped}/bin/readelf" substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${sysctl}/bin/sysctl -" substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -" ''; diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index e36aaa5e38d0..04da31176da2 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.libc.linuxHeaders libtool gettext ]; - meta = { + meta = with stdenv.lib; { description = "Tools to display or change the CPU governor settings"; - platforms = stdenv.lib.platforms.linux; + homepage = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/os-specific/linux/cramfsswap/default.nix index 6f11a3bb7a72..d183bb25cb56 100644 --- a/pkgs/os-specific/linux/cramfsswap/default.nix +++ b/pkgs/os-specific/linux/cramfsswap/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation { buildInputs = [zlib]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "swap endianess of a cram filesystem (cramfs)"; + homepage = "https://packages.debian.org/sid/utils/cramfsswap"; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index fc13d97429c2..5211fd2a61bf 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + patchShebangs tests + ''; + NIX_LDFLAGS = "-lgcc_s"; configureFlags = [ diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index a6f6365ae631..129ccb304564 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 8d18d5980207..c6792ea17fb5 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -12,7 +12,12 @@ stdenv.mkDerivation rec { buildInputs = [ flex perl ]; - configureFlags = "--without-distro --without-pacemaker --localstatedir=/var --sysconfdir=/etc"; + configureFlags = [ + "--without-distro" + "--without-pacemaker" + "--localstatedir=/var" + "--sysconfdir=/etc" + ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 0adeac7115df..8cc481334e3b 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ makefu ]; platforms = lib.platforms.linux; + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index 70c1a8cfdf55..dd3eec6f53ca 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -6,7 +6,7 @@ let version="1.7.0"; name="fbterm-1.7.0"; hash="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; - url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz"; sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; }; buildInputs = [gpm freetype fontconfig ncurses] diff --git a/pkgs/os-specific/linux/fbterm/default.upstream b/pkgs/os-specific/linux/fbterm/default.upstream deleted file mode 100644 index 387ef8862fbf..000000000000 --- a/pkgs/os-specific/linux/fbterm/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url http://code.google.com/p/fbterm/downloads/list -version_link '[.]tar[.][a-z0-9]+$' -process 'code[.]google[.]com//' '' diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix index 01609c8779dd..a57a6f1d70f6 100644 --- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -27,11 +27,15 @@ stdenv.mkDerivation rec { linkname=$(basename $filename | awk 'match($0,/^(BCM)[0-9A-Z]+(-[0-9a-z]{4}-[0-9a-z]{4}\.hcd)$/,c) { print c[1]c[2] }') if ! [ -z $linkname ] then - ln -s -T $filename $out/lib/firmware/brcm/$linkname + ln -s --relative -T $filename $out/lib/firmware/brcm/$linkname fi done ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "042frb2dmrqfj8q83h5p769q6hg2b3i8fgnyvs9r9a71z7pbsagq"; + meta = with stdenv.lib; { description = "Firmware for Broadcom WIDCOMM® Bluetooth devices"; homepage = http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth; diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 47d56cbf7967..47fe2e446c3e 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { sha256 = "110vxgahyx5dvylqrxsm5cmx4a32cl2zchvm6cgc270jz75fg7wd"; }; - preInstall = '' - mkdir -p $out - ''; - installFlags = [ "DESTDIR=$(out)" ]; # Firmware blobs do not need fixing and should not be modified dontFixup = true; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "0r2g91hc7csp2fbp2ny4s4rwv0mw2m130gpnisxnhzi05hkwki66"; + meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; homepage = http://packages.debian.org/sid/firmware-linux-nonfree; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 646c18860c5d..f018b5c2a7df 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -1,41 +1,42 @@ -{ stdenv, fetchurl, fetchpatch, gtk-doc, pkgconfig, gobjectIntrospection, intltool +{ stdenv, fetchurl, gtk-doc, pkgconfig, gobjectIntrospection, intltool , libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib-networking , libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales -, fwupdate, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl -, ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib -, shared-mime-info, umockdev +, gnu-efi, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl +, ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib, bash-completion +, shared-mime-info, umockdev, vala, makeFontsConf, freefont_ttf }: let # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc - version = "1.0.5"; + version = "1.1.1"; python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]); installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]); + + fontsConf = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; in stdenv.mkDerivation { name = "fwupd-${version}"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "0wm195vkf6x1kg1dz0sbfwpdcn9f6638l7vyzplcfrb3v07pqxpq"; + sha256 = "0szakfnp6pl8vv3ivb40p5j8pxapfp724a55s2dr1qzzdlbjd08s"; }; - outputs = [ "out" "devdoc" "man" "installedTests" ]; + outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; nativeBuildInputs = [ meson ninja gtk-doc pkgconfig gobjectIntrospection intltool glibcLocales shared-mime-info - valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook + valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook vala ]; buildInputs = [ - polkit appstream-glib gusb sqlite libarchive libsoup elfutils libsmbios fwupdate libyaml + polkit appstream-glib gusb sqlite libarchive libsoup elfutils libsmbios gnu-efi libyaml libgudev colord gpgme libuuid gnutls glib-networking efivar json-glib umockdev + bash-completion ]; LC_ALL = "en_US.UTF-8"; # For po/make-images patches = [ - ./fix-missing-deps.patch - (fetchpatch { - url = https://github.com/hughsie/fwupd/commit/767210e4b1401d5d5bb7ac1e7c052a60b6529d88.patch; - sha256 = "00adfabxpgdg74jx7i6jihhh8njjk2r7v3fxqs4scj3vn06k5fmw"; - }) + ./fix-paths.patch ]; postPatch = '' @@ -47,7 +48,8 @@ in stdenv.mkDerivation { substituteInPlace data/installed-tests/fwupdmgr.test.in --subst-var-by installedtestsdir "$installedTests/share/installed-tests/fwupd" ''; - doCheck = true; + # /etc/os-release not available in sandbox + # doCheck = true; preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") @@ -55,18 +57,29 @@ in stdenv.mkDerivation { mesonFlags = [ "-Dplugin_dummy=true" - "-Dbootdir=/boot" "-Dudevdir=lib/udev" "-Dsystemdunitdir=lib/systemd/system" + "-Defi-libdir=${gnu-efi}/lib" + "-Defi-ldsdir=${gnu-efi}/lib" + "-Defi-includedir=${gnu-efi}/include/efi" "--localstatedir=/var" ]; + # TODO: We need to be able to override the directory flags from meson setup hook + # better – declaring them multiple times might become an error. + preConfigure = '' + mesonFlagsArray+=("--libexecdir=$out/libexec") + ''; + postInstall = '' moveToOutput share/installed-tests "$installedTests" wrapProgram $installedTests/share/installed-tests/fwupd/hardware.py \ --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:${libsoup}/lib/girepository-1.0" ''; + FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + + # /etc/fwupd/uefi.conf is created by the services.hardware.fwupd NixOS module passthru = { filesInstalledToEtc = [ "fwupd/remotes.d/fwupd.conf" @@ -74,8 +87,10 @@ in stdenv.mkDerivation { "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" "pki/fwupd/GPG-KEY-Hughski-Limited" + "pki/fwupd/GPG-KEY-Linux-Foundation-Metadata" "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" "pki/fwupd/LVFS-CA.pem" + "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata" "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" "pki/fwupd-metadata/LVFS-CA.pem" ]; diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch b/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch index d1d7c06027f9..1cd9eb0e8f17 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch @@ -6,7 +6,7 @@ -) --- a/data/meson.build +++ b/data/meson.build -@@ -7,16 +7,12 @@ +@@ -8,16 +8,12 @@ subdir('installed-tests') endif @@ -26,8 +26,8 @@ install_data(['metadata.xml'], --- a/data/pki/meson.build +++ b/data/pki/meson.build -@@ -3,13 +3,13 @@ - 'GPG-KEY-Hughski-Limited', +@@ -4,14 +4,14 @@ + 'GPG-KEY-Linux-Foundation-Firmware', 'GPG-KEY-Linux-Vendor-Firmware-Service', ], - install_dir : join_paths(sysconfdir, 'pki', 'fwupd') @@ -35,6 +35,7 @@ ) install_data([ + 'GPG-KEY-Linux-Foundation-Metadata', 'GPG-KEY-Linux-Vendor-Firmware-Service', ], - install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') @@ -42,7 +43,7 @@ ) endif -@@ -17,12 +17,12 @@ +@@ -19,12 +19,12 @@ install_data([ 'LVFS-CA.pem', ], @@ -66,9 +67,9 @@ - install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d') + install_dir : join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d') ) - endif - -@@ -19,12 +19,12 @@ + i18n.merge_file( + input: 'lvfs.metainfo.xml', +@@ -37,12 +37,12 @@ output : 'fwupd.conf', configuration : con2, install: true, @@ -92,13 +93,3 @@ - echo 'Creating stateful directory' - mkdir -p ${DESTDIR}${LOCALSTATEDIR}/lib/fwupd #fi ---- a/po/make-images.sh -+++ b/po/make-images.sh -@@ -7,6 +7,7 @@ - # - install -m 0755 -d ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/ - ${MESON_SOURCE_ROOT}/po/make-images "Installing firmware update…" ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/ ${MESON_SOURCE_ROOT}/po/LINGUAS -+shopt -s nullglob - for x in ${MESON_INSTALL_DESTDIR_PREFIX}/share/locale/*/LC_IMAGES/*.bmp ; do - gzip -f ${x} - done diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index bf8bcf387261..372be2d71f2c 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -1,35 +1,25 @@ -{ stdenv, fetchurl }: +{ lib, fetchzip }: let version = "3.1"; in -stdenv.mkDerivation { +fetchzip { name = "intel2200BGFirmware-${version}"; + url = "https://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; + sha256 = "0zjyjndyc401pn5x5lgypxdal21n82ymi3vbb2ja1b89yszj432b"; - src = fetchurl { - url = "https://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; - sha256 = "c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/lib/firmware - for fw in \ - ipw2200-bss.fw \ - ipw2200-ibss.fw \ - ipw2200-sniffer.fw - do - cp -f $fw $out/lib/firmware/$fw - done - mkdir -p $out/share/doc/intel2200BGFirmware - cp -f LICENSE.ipw2200-fw $out/share/doc/intel2200BGFirmware/LICENSE + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 + install -D -m644 ipw2200-bss.fw $out/lib/firmware/ipw2200-bss.fw + install -D -m644 ipw2200-ibss.fw $out/lib/firmware/ipw2200-ibss.fw + install -D -m644 ipw2200-sniffer.fw $out/lib/firmware/ipw2200-sniffer.fw + install -D -m644 LICENSE.ipw2200-fw $out/share/doc/intel2200BGFirmware/LICENSE ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Firmware for Intel 2200BG cards"; homepage = http://ipw2200.sourceforge.net/firmware.php; - license = stdenv.lib.licenses.unfreeRedistributableFirmware; + license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ sternenseemann ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 0918279cc9a9..eb5b0bd294c8 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, dpkg }: stdenv.mkDerivation rec { name = "raspberrypi-wireless-firmware-${version}"; @@ -20,11 +20,12 @@ stdenv.mkDerivation rec { # Firmware blobs do not need fixing and should not be modified dontFixup = true; + # Unpack the debian package + nativeBuildInputs = [ dpkg ]; unpackCmd = '' if ! [[ "$curSrc" =~ \.deb$ ]]; then return 1; fi - ar -xf "$curSrc" - tar -xf data.tar.xz + dpkg -x "$curSrc" . ''; installPhase = '' @@ -39,6 +40,10 @@ stdenv.mkDerivation rec { cp broadcom/*.hcd "$out/lib/firmware/brcm" ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "1gwzasl5w5nc0awqv3w2081ns63wd1yds0xh0dg95dc6brnqhhf8"; + meta = with stdenv.lib; { description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3 and Zero W"; homepage = https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/; diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index e28a85ab0b27..2c9db47539f7 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -1,23 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +let pname = "zd1211-firmware"; version = "1.5"; - +in fetchzip rec { name = "${pname}-${version}"; + url = "mirror://sourceforge/zd1211/${name}.tar.bz2"; - src = fetchurl { - url = "mirror://sourceforge/zd1211/${name}.tar.bz2"; - sha256 = "04ibs0qw8bh6h6zmm5iz6lddgknwhsjq8ib3gyck6a7psw83h7gi"; - }; - - dontBuild = true; - - installPhase = '' + postFetch = '' + tar -xjvf $downloadedFile mkdir -p $out/lib/firmware/zd1211 - cp * $out/lib/firmware/zd1211 + cp zd1211-firmware/* $out/lib/firmware/zd1211 ''; + sha256 = "0sj2zl3r0549mjz37xy6iilm1hm7ak5ax02gwrn81r5yvphqzd52"; + meta = { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; homepage = https://sourceforge.net/projects/zd1211/; diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 7cc58c19c07d..15470479a3a2 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -4,6 +4,7 @@ , fusePackages, utillinux, gettext , meson, ninja, pkgconfig , autoreconfHook +, python3Packages, which }: let @@ -58,6 +59,14 @@ in stdenv.mkDerivation rec { ./makeconf.sh ''); + checkInputs = [ which ] ++ (with python3Packages; [ python pytest ]); + + checkPhase = '' + python3 -m pytest test/ + ''; + + doCheck = false; # v2: no tests, v3: all tests get skipped in a sandbox + postFixup = "cd $out\n" + (if isFuse3 then '' install -D -m444 etc/fuse.conf $common/etc/fuse.conf install -D -m444 etc/udev/rules.d/99-fuse3.rules $common/etc/udev/rules.d/99-fuse.rules @@ -72,6 +81,7 @@ in stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Kernel module and library that allows filesystems to be implemented in user space"; platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl21 ]; maintainers = [ maintainers.primeos ]; }; } diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 40d6967c66f4..e54ab7bcba73 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "18.06.02"; + version = "18.07.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "1j7yn3qyy9baylhjvr9j8hiyl1nc7la1j4fffvxk8qvxakwxbyl2"; + sha256 = "11fc26k1k98i1rv1jw9ahbbal7p7cl6wxy967a7ixs330q5ry1lb"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 8485b0e60328..61bd2a229ab6 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "fxload-2002_04_11"; - + src = fetchurl { url = mirror://sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz; sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m"; @@ -27,9 +27,10 @@ stdenv.mkDerivation { mkdir -p $out/share/usb ''; - meta = { + meta = with stdenv.lib; { homepage = http://linux-hotplug.sourceforge.net/?selected=usb; description = "Tool to upload firmware to Cypress EZ-USB microcontrollers"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index c1d324de7cff..5943ced2f8f9 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -1,20 +1,26 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.313"; + version = "0.314"; - src = fetchurl { - url = "https://github.com/vcrhonek/hwdata/archive/v0.313.tar.gz"; - sha256 = "0x0qk2cim1mv8cl8h8rwqn8mbbs43j04rn06m81b531i182zii17"; + src = fetchFromGitHub { + owner = "vcrhonek"; + repo = "hwdata"; + rev = "v${version}"; + sha256 = "12k466ndg152fqld1w5v1zfdyv000yypazcwy75ywlxvlknv4y90"; }; preConfigure = "patchShebangs ./configure"; - configureFlags = "--datadir=$(prefix)/data"; + configureFlags = [ "--datadir=$(prefix)/data" ]; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "1w00y5kj8rd8slzydw1gw8cablxlkham4vq786kdd8zga286zabb"; + meta = { homepage = https://github.com/vcrhonek/hwdata; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index a19b3d4ec16c..e2ded7a8fd0c 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -10,9 +10,11 @@ python2Packages.buildPythonApplication rec { doCheck = false; - meta = { + meta = with stdenv.lib; { description = "A tool to find out the processes doing the most IO"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://guichaz.free.fr/iotop; + license = licenses.gpl2; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 4204105bb605..d8197edc46c5 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv, config, flex, bash, bison, db, iptables, pkgconfig }: +{ fetchurl, stdenv, config, flex, bash, bison, db, iptables, pkgconfig +, libelf +}: stdenv.mkDerivation rec { name = "iproute2-${version}"; @@ -35,7 +37,7 @@ stdenv.mkDerivation rec { "CONFDIR=$(out)/etc/iproute2" ]; - buildInputs = [ db iptables ]; + buildInputs = [ db iptables libelf ]; nativeBuildInputs = [ bison flex pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index e27f380ac3e2..dd7d25716dc4 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -28,19 +28,19 @@ stdenv.mkDerivation rec { # fix build with newer gcc versions preConfigure = ''substituteInPlace configure --replace "-Werror" "" ''; - configureFlags = '' - --sysconfdir=/etc --localstatedir=/var - --with-kernel-headers=${linuxHeaders}/include - --disable-security-context - --enable-adminport - --enable-dpd - --enable-frag - --enable-gssapi - --enable-hybrid - --enable-natt - --enable-shared - --enable-stats - ''; + configureFlags = [ + "--sysconfdir=/etc --localstatedir=/var" + "--with-kernel-headers=${linuxHeaders}/include" + "--disable-security-context" + "--enable-adminport" + "--enable-dpd" + "--enable-frag" + "--enable-gssapi" + "--enable-hybrid" + "--enable-natt" + "--enable-shared" + "--enable-stats" + ]; meta = { homepage = http://ipsec-tools.sourceforge.net/; diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 0c088ac2a4bc..9fa7a2cf0aa7 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl" ''; - configureFlags = '' - --enable-devel - --enable-shared - ''; + configureFlags = [ + "--enable-devel" + "--enable-shared" + ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 4caa0acb4b6a..557bc2f186f3 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,55 +1,69 @@ -{ stdenv, fetchurl -, sysfsutils, openssl -, libcap, opensp, docbook_sgml_dtd_31 -, libidn, nettle -, SGMLSpm, libgcrypt }: +{ stdenv, fetchFromGitHub, fetchpatch +, libxslt, docbook_xsl, docbook_xml_dtd_44 +, sysfsutils, openssl, libcap, libgcrypt, nettle, libidn2 +}: let - time = "20161105"; + time = "20180629"; in stdenv.mkDerivation rec { name = "iputils-${time}"; - src = fetchurl { - url = "https://github.com/iputils/iputils/archive/s${time}.tar.gz"; - sha256 = "12mdmh4qbf5610csaw3rkzhpzf6djndi4jsl4gyr8wni0cphj4zq"; + src = fetchFromGitHub { + owner = "iputils"; + repo = "iputils"; + rev = "s${time}"; + sha256 = "19rpl48pjgmyqlm4h7sml5gy7yg4cxciadxcs24q1zj40c05jls0"; }; + patches = [ + (fetchpatch { + name = "dont-hardcode-the-location-of-xsltproc.patch"; + url = "https://github.com/iputils/iputils/commit/d0ff83e87ea9064d9215a18e93076b85f0f9e828.patch"; + sha256 = "05wrwf0bfmax69bsgzh3b40n7rvyzw097j8z5ix0xsg0kciygjvx"; + }) + ]; + prePatch = '' - sed -e s/sgmlspl/sgmlspl.pl/ \ - -e s/nsgmls/onsgmls/ \ - -i doc/Makefile + substituteInPlace doc/custom-man.xsl \ + --replace "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" + for xmlFile in doc/*.xml; do + substituteInPlace $xmlFile \ + --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd" + done ''; # Disable idn usage w/musl: https://github.com/iputils/iputils/pull/111 makeFlags = [ "USE_GNUTLS=no" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "USE_IDN=no"; - depsBuildBuild = [ opensp SGMLSpm docbook_sgml_dtd_31 ]; + nativeBuildInputs = [ libxslt.bin ]; buildInputs = [ sysfsutils openssl libcap libgcrypt nettle - ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn; + ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn2; # ninfod probably could build on cross, but the Makefile doesn't pass --host etc to the sub configure... - buildFlags = "man all" + stdenv.lib.optionalString (!stdenv.isCross) " ninfod"; + buildFlags = "man all" + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) " ninfod"; installPhase = '' mkdir -p $out/bin - cp -p ping tracepath clockdiff arping rdisc rarpd $out/bin/ + cp -p arping clockdiff ping rarpd rdisc tftpd tracepath traceroute6 $out/bin/ if [ -x ninfod/ninfod ]; then cp -p ninfod/ninfod $out/bin fi mkdir -p $out/share/man/man8 + cd doc cp -p \ - doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 doc/rarpd.8 doc/tracepath.8 doc/ninfod.8 \ + arping.8 clockdiff.8 ninfod.8 pg3.8 ping.8 rarpd.8 rdisc.8 tftpd.8 tracepath.8 traceroute6.8 \ $out/share/man/man8 ''; meta = with stdenv.lib; { homepage = https://github.com/iputils/iputils; description = "A set of small useful utilities for Linux networking"; + license = with licenses; [ gpl2Plus bsd3 ]; # TODO: AS-IS, SUN MICROSYSTEMS license platforms = platforms.linux; - maintainers = with maintainers; [ lheckemann ]; + maintainers = with maintainers; [ primeos lheckemann ]; }; } diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 7e277617b61a..84d1dd8a378e 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -22,7 +22,7 @@ ${optionalString (versionAtLeast version "4.10") '' BUG_ON_DATA_CORRUPTION y ''} -${optionalString (stdenv.platform.kernelArch == "x86_64") '' +${optionalString (stdenv.hostPlatform.platform.kernelArch == "x86_64") '' DEFAULT_MMAP_MIN_ADDR 65536 # Prevent allocation of first 64K of memory # Reduce attack surface by disabling various emulations @@ -103,16 +103,17 @@ PAGE_POISONING_ZERO y PANIC_ON_OOPS y PANIC_TIMEOUT -1 -GCC_PLUGINS y # Enable gcc plugin options +${optionalString (versionOlder version "4.18") '' + GCC_PLUGINS y # Enable gcc plugin options + # Gather additional entropy at boot time for systems that may not have appropriate entropy sources. + GCC_PLUGIN_LATENT_ENTROPY y -# Gather additional entropy at boot time for systems that may not have appropriate entropy sources. -GCC_PLUGIN_LATENT_ENTROPY y - -${optionalString (versionAtLeast version "4.11") '' - GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin -''} -${optionalString (versionAtLeast version "4.14") '' - GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address + ${optionalString (versionAtLeast version "4.11") '' + GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin + ''} + ${optionalString (versionAtLeast version "4.14") '' + GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address + ''} ''} # Disable various dangerous settings @@ -121,8 +122,10 @@ PROC_KCORE n # Exposes kernel text image layout INET_DIAG n # Has been used for heap based attacks in the past # Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage. -CC_STACKPROTECTOR_REGULAR n -CC_STACKPROTECTOR_STRONG y +${optionalString (versionOlder version "4.18") '' + CC_STACKPROTECTOR_REGULAR n + CC_STACKPROTECTOR_STRONG y +''} # Enable compile/run-time buffer overflow detection ala glibc's _FORTIFY_SOURCE ${optionalString (versionAtLeast version "4.13") '' diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index c5a53555d20f..de983418b7be 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 stdenv.lib; buildLinux (args // rec { - version = "4.14.59"; + version = "4.14.66"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16ribg80jk830wyk4k7v86jysmnkj59v62rlkqil3advc7337iky"; + sha256 = "04q48syzmz84s045bqwyzrr37wcria8waggb5fki2kc69k563053"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index 71984ec5c779..126c3284d05f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.17.11"; + version = "4.17.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "133jyd75a0gq71m783s3ydjkpnzw5xxn4wrk1zal6fr19znq87nv"; + sha256 = "03wvnw4xl48na08c29qq57a39kgvb67ayxfqqv4n06vpf8vmx2sd"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix new file mode 100644 index 000000000000..768a4c96542d --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "4.18.4"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "0hm8id6nv3j2g7l1fzkl4vr9wfx43s8hdspg1yc4fz6vbdxwinqj"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 8bb2d53da9e0..31f489c4faff 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.145"; + version = "4.4.151"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1max0d1b1y1ndrfprrcyb7c9y12pkx2whxzlr70qypcb5jz0v7ff"; + sha256 = "1s49h2my2jysh1i38vygqlcj9bz8fzg6vsv9k3ln3pi6hqqqrsjz"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d89d0151d9b9..9b9072d302e1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.116"; + version = "4.9.123"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "07gzjfv24jrn76aga7c8f1y5xsz5if6xbdli1cpfzg60ps8q57lr"; + sha256 = "0wahbq08cixh63099n13wal3xkw48gnka6w8biax1gwckymww4ld"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index 3fc08e642871..53d8accb1856 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -6,7 +6,7 @@ buildLinux (args // rec { # modDirVersion needs to be x.y.z. modDirVersion = "4.14.55"; - # branchVersion needs to be x.y. + # branchVersion needs to be x.y. extraMeta.branch = "4.14"; src = fetchFromGitHub { @@ -28,4 +28,6 @@ buildLinux (args // rec { '' + (args.extraConfig or ""); + extraMeta.platforms = [ "armv7l-linux" ]; + } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 1366a11b573c..1fb9866f4e95 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,22 +1,21 @@ { stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.15.2018.04.14"; - modDirVersion = "4.15.0"; - extraMeta.branch = "master"; - extraMeta.maintainers = [ stdenv.lib.maintainers.davidak stdenv.lib.maintainers.chiiruno ]; + version = "4.16.2018.08.03"; + modDirVersion = "4.16.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "3b7c824e9330a640312fce1b04537c684c1d602c"; - sha256 = "1l5ib28qkhrxggn6zj9b2839543anbxk2ip75yizgzlv9vr5m4pk"; + rev = "e7a00a52b57336c04d1043c6fa0a67a7c8301cfb"; + sha256 = "1a0kvpazvvh0rfb9hkyr4zw55ndh060j95fvhf2aaaj9qyc7p7wp"; }; - extraConfig = '' - BCACHEFS_FS m - ''; + extraConfig = "BCACHEFS_FS m"; - # Should the testing kernels ever be built on Hydra? - extraMeta.hydraPlatforms = []; + extraMeta = { + branch = "master"; + hydraPlatforms = []; # Should the testing kernels ever be built on Hydra? + maintainers = with stdenv.lib.maintainers; [ davidak chiiruno ]; + }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index ec4d9c29dbc7..ec3baaf1e0a4 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.18-rc7"; - modDirVersion = "4.18.0-rc7"; + version = "4.18-rc8"; + modDirVersion = "4.18.0-rc8"; extraMeta.branch = "4.18"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "005kk7rxawkka60y31a5aiqrq3w6i1k27b5n2lcq63agjcxh54rq"; + sha256 = "0rqyqms63c15iwcwy40yqd9fvlvh3ah09gddv0wf45z9dqp7id1m"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 1a365046f5f3..143671428c41 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -48,17 +48,6 @@ rec { }; }; - # https://patchwork.kernel.org/patch/9626797/ - # Should be included in 4.17, so this patch can be dropped when 4.16 becomes obsolete. - bcm2835_mmal_v4l2_camera_driver = rec { - name = "bcm2835_mmal_v4l2_camera_driver"; - patch = fetchpatch { - name = name + ".patch"; - url = https://patchwork.kernel.org/patch/9626797/raw/; - sha256 = "0iwb0yxsf95zv4qxkvlvhqfmzx0rk13g9clvxsharvwkb4w5lwa0"; - }; - }; - # https://github.com/NixOS/nixpkgs/issues/42755 xen-netfront_fix_mismatched_rtnl_unlock = rec { name = "xen-netfront_fix_mismatched_rtnl_unlock"; diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index e2be136adee1..949c8135df7b 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -14,10 +14,20 @@ stdenv.mkDerivation rec { sha256 = "1kqpiswjn549s3w3m89bw5qkl7bw5pvq6gp5cdzd926ymlgivj5c"; }) ]; + postPatch = '' + patchShebangs harness + + # Makefile is too optimistic, gcc is too smart + substituteInPlace harness/Makefile \ + --replace "-Werror" "" + ''; + makeFlags = "prefix=$(out)"; hardeningDisable = stdenv.lib.optional (stdenv.isi686) "stackprotector"; + checkTarget = "partcheck"; # "check" needs root + meta = { description = "Library for asynchronous I/O in Linux"; homepage = http://lse.sourceforge.net/io/aio.html; diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 8248a628f0ac..a7e8894ccfef 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { meta = { description = "Library for working with POSIX capabilities"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix index 1c44c0d78a8a..d500019c50b4 100644 --- a/pkgs/os-specific/linux/light/default.nix +++ b/pkgs/os-specific/linux/light/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, help2man }: +{ stdenv, fetchFromGitHub, help2man }: stdenv.mkDerivation rec { - version = "1.0"; + version = "1.1.2"; name = "light-${version}"; - src = fetchurl { - url = "https://github.com/haikarainen/light/archive/v${version}.tar.gz"; - sha256 = "974608ee42ffe85cfd23184306d56d86ec4e6f4b0518bafcb7b3330998b1af64"; + src = fetchFromGitHub { + owner = "haikarainen"; + repo = "light"; + rev = version; + sha256 = "0c934gxav9cgdf94li6dp0rfqmpday9d33vdn9xb2mfp4war9n4w"; }; + buildInputs = [ help2man ]; installPhase = "mkdir -p $out/bin; cp light $out/bin/"; diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index d250d658282f..aba907039aca 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "lsscsi-0.29"; + name = "lsscsi-0.30"; src = fetchurl { - url = "http://sg.danny.cz/scsi/lsscsi-0.29.tgz"; - sha256 = "0538fjgxky03yn7mzyslkyi2af3yy5llsnjjcgjx73x08wd6hv5n"; + url = "http://sg.danny.cz/scsi/lsscsi-0.30.tgz"; + sha256 = "05cba72m0hj3kpikk26h7j02cly7zy5lgww2fvswa0jz823j36k1"; }; preConfigure = '' substituteInPlace Makefile.in --replace /usr "$out" ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index a24024112c95..096eefe8a68f 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -78,11 +78,12 @@ stdenv.mkDerivation { cp scripts/lvm2_activation_generator_systemd_red_hat $out/lib/systemd/system-generators ''; - meta = { + meta = with stdenv.lib; { homepage = http://sourceware.org/lvm2/; description = "Tools to support Logical Volume Management (LVM) on Linux"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [raskin]; + platforms = platforms.linux; + license = with licenses; [ gpl2 bsd2 lgpl21 ]; + maintainers = with maintainers; [raskin]; inherit version; downloadPage = "ftp://sources.redhat.com/pub/lvm2/"; }; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index e5ee5e202944..642653259c34 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "159"; + version = "160"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "1w8y4igxi48r2d9s6g9fm1bgmsga94gfz6x0xaln6rhvbgi318xg"; + sha256 = "1m985wvdykl3003967lp1i7707qhwdj3h13cl8g1afjaip9ccd48"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index b6fdae75bac2..6de666630bb3 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -44,9 +44,10 @@ stdenv.mkDerivation rec { -e 's@/usr/sbin/sendmail@${sendmail-script}@' -i Makefile ''; - meta = { + meta = with stdenv.lib; { description = "Programs for managing RAID arrays under Linux"; homepage = http://neil.brown.name/blog/mdadm; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/microcode/intel-microcode2ucode.c b/pkgs/os-specific/linux/microcode/intel-microcode2ucode.c deleted file mode 100644 index c1660fae38a1..000000000000 --- a/pkgs/os-specific/linux/microcode/intel-microcode2ucode.c +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Convert Intel microcode.dat into a single binary microcode.bin file - * - * Based on code by Kay Sievers <kay.sievers@vrfy.org> - * Changed to create a single file by Thomas Bächler <thomas@archlinux.org> - */ - - -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#include <stdio.h> -#include <unistd.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> -#include <limits.h> -#include <stdbool.h> -#include <inttypes.h> -#include <fcntl.h> -#include <errno.h> -#include <sys/stat.h> - -struct microcode_header_intel { - unsigned int hdrver; - unsigned int rev; - unsigned int date; - unsigned int sig; - unsigned int cksum; - unsigned int ldrver; - unsigned int pf; - unsigned int datasize; - unsigned int totalsize; - unsigned int reserved[3]; -}; - -union mcbuf { - struct microcode_header_intel hdr; - unsigned int i[0]; - char c[0]; -}; - -int main(int argc, char *argv[]) -{ - const char *filename = "/lib/firmware/microcode.dat"; - FILE *f; - char line[LINE_MAX]; - char buf[4000000]; - union mcbuf *mc; - size_t bufsize, count, start; - int rc = EXIT_SUCCESS; - - if (argv[1] != NULL) - filename = argv[1]; - - count = 0; - mc = (union mcbuf *) buf; - f = fopen(filename, "re"); - if (f == NULL) { - printf("open %s: %m\n", filename); - rc = EXIT_FAILURE; - goto out; - } - - while (fgets(line, sizeof(line), f) != NULL) { - if (sscanf(line, "%x, %x, %x, %x", - &mc->i[count], - &mc->i[count + 1], - &mc->i[count + 2], - &mc->i[count + 3]) != 4) - continue; - count += 4; - } - fclose(f); - - bufsize = count * sizeof(int); - printf("%s: %lu(%luk) bytes, %zu integers\n", - filename, - bufsize, - bufsize / 1024, - count); - - if (bufsize < sizeof(struct microcode_header_intel)) - goto out; - - f = fopen("microcode.bin", "we"); - if (f == NULL) { - printf("open microcode.bin: %m\n"); - rc = EXIT_FAILURE; - goto out; - } - - start = 0; - for (;;) { - size_t size; - unsigned int family, model, stepping; - unsigned int year, month, day; - - mc = (union mcbuf *) &buf[start]; - - if (mc->hdr.totalsize) - size = mc->hdr.totalsize; - else - size = 2000 + sizeof(struct microcode_header_intel); - - if (mc->hdr.ldrver != 1 || mc->hdr.hdrver != 1) { - printf("unknown version/format:\n"); - rc = EXIT_FAILURE; - break; - } - - /* - * 0- 3 stepping - * 4- 7 model - * 8-11 family - * 12-13 type - * 16-19 extended model - * 20-27 extended family - */ - family = (mc->hdr.sig >> 8) & 0xf; - if (family == 0xf) - family += (mc->hdr.sig >> 20) & 0xff; - model = (mc->hdr.sig >> 4) & 0x0f; - if (family == 0x06) - model += ((mc->hdr.sig >> 16) & 0x0f) << 4; - stepping = mc->hdr.sig & 0x0f; - - year = mc->hdr.date & 0xffff; - month = mc->hdr.date >> 24; - day = (mc->hdr.date >> 16) & 0xff; - - printf("\n"); - printf("signature: 0x%02x\n", mc->hdr.sig); - printf("flags: 0x%02x\n", mc->hdr.pf); - printf("revision: 0x%02x\n", mc->hdr.rev); - printf("date: %04x-%02x-%02x\n", year, month, day); - printf("size: %zu\n", size); - - if (fwrite(mc, size, 1, f) != 1) { - printf("write microcode.bin: %m\n"); - rc = EXIT_FAILURE; - goto out; - } - - start += size; - if (start >= bufsize) - break; - } - fclose(f); - printf("\n"); -out: - return rc; -} diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 857a3b580a8e..403824fb3a45 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, libarchive }: +{ stdenv, fetchurl, libarchive, iucode-tool }: stdenv.mkDerivation rec { name = "microcode-intel-${version}"; - version = "20180312"; + version = "20180807"; src = fetchurl { - url = "https://downloadmirror.intel.com/27591/eng/microcode-${version}.tgz"; - sha256 = "0yg7q5blcqgq8jyjxhn9n48rxws77ylqzyn4kn10l6yzwan1yf0b"; + url = "https://downloadmirror.intel.com/28039/eng/microcode-${version}.tgz"; + sha256 = "0h4ygwx5brnrjz8v47aikrwhf0q3jhizxmzcii4bdjg64zffiy99"; }; - buildInputs = [ libarchive ]; + nativeBuildInputs = [ iucode-tool libarchive ]; sourceRoot = "."; - buildPhase = '' - gcc -O2 -Wall -o intel-microcode2ucode ${./intel-microcode2ucode.c} - ./intel-microcode2ucode microcode.dat - ''; - installPhase = '' + runHook preInstall + mkdir -p $out kernel/x86/microcode - mv microcode.bin kernel/x86/microcode/GenuineIntel.bin + iucode_tool -w kernel/x86/microcode/GenuineIntel.bin intel-ucode/ echo kernel/x86/microcode/GenuineIntel.bin | bsdcpio -o -H newc -R 0:0 > $out/intel-ucode.img + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/os-specific/linux/microcode/iucode-tool.nix new file mode 100644 index 000000000000..485272b1401b --- /dev/null +++ b/pkgs/os-specific/linux/microcode/iucode-tool.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitLab, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "iucode-tool-${version}"; + version = "2.3.1"; + + src = fetchFromGitLab { + owner = "iucode-tool"; + repo = "iucode-tool"; + rev = "v${version}"; + sha256 = "04dlisw87dd3q3hhmkqc5dd58cp22fzx3rzah7pvcyij135yjc3a"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Intel® 64 and IA-32 processor microcode tool"; + homepage = https://gitlab.com/iucode-tool/iucode-tool; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index d36544453323..a29a03734242 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation { makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8) ''; - meta = { + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/mingetty; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index b491d5bbda7e..533cd90a2d3c 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 rec { name = "mmc-utils-${version}"; - version = "2015-11-18"; + version = "2018-03-27"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git"; - rev = "44f94b925894577f9ffcf2c418dd013a5e582648"; - sha256 = "0hkdzc71pdnscbpdpgwljcchiyancarldjyd0w609sy18bky833x"; + rev = "b4fe0c8c0e57a74c01755fa9362703b60d7ee49d"; + sha256 = "01llwan5j40mv5p867f31lm87qh0hcyhy892say60y5pxc0mzpyn"; }; makeFlags = "CC=${stdenv.cc.targetPrefix}cc"; diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index 70cbae88d695..ef0bdc4f1266 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -1,8 +1,8 @@ {stdenv, fetchurl, openldap, perl}: - + stdenv.mkDerivation { name = "nss_ldap-265"; - + src = fetchurl { url = http://www.padl.com/download/nss_ldap-265.tar.gz; sha256 = "1a16q9p97d2blrj0h6vl1xr7dg7i4s8x8namipr79mshby84vdbp"; @@ -29,7 +29,9 @@ stdenv.mkDerivation { buildInputs = [ openldap perl ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "LDAP module for the Solaris Nameservice Switch (NSS)"; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 9928897ae4d4..bf21f92bd66d 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -2,31 +2,35 @@ stdenv.mkDerivation rec { name = "numactl-${version}"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "numactl"; repo = "numactl"; rev = "v${version}"; - sha256 = "0bcffqawwbyrnza8np0whii25mfd0dria35zal9v3l55xcrya3j9"; + sha256 = "0crhpxwakp0gvd7wwpbkfd3brnrdf89lkbf03axnbrs0b6kaygg2"; }; nativeBuildInputs = [ autoreconfHook ]; - patches = [ - (fetchpatch { - url = https://raw.githubusercontent.com/gentoo/gentoo/b64d15e731e3d6a7671f0ec6c34a20203cf2609d/sys-process/numactl/files/numactl-2.0.11-sysmacros.patch; - sha256 = "05277kv3x12n2xlh3fgnmxclxfc384mkwb0v9pd91046khj6h843"; - }) - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { url = https://git.alpinelinux.org/cgit/aports/plain/testing/numactl/musl.patch?id=0592b128c71c3e70d493bc7a13caed0d7fae91dd; sha256 = "080b0sygmg7104qbbh1amh3b322yyiajwi2d3d0vayffgva0720v"; }); + postPatch = '' + patchShebangs test + ''; + + # You probably shouldn't ever run these! They will reconfigure Linux + # NUMA settings, which on my build machine makes the rest of package + # building ~5% slower until reboot. Ugh! + doCheck = false; # never ever! + meta = with stdenv.lib; { description = "Library and tools for non-uniform memory access (NUMA) machines"; - homepage = http://oss.sgi.com/projects/libnuma/; - license = licenses.gpl2; + homepage = https://github.com/numactl/numactl; + license = with licenses; [ gpl2 lgpl21 ]; # libnuma is lgpl21 platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 0ededc08050d..eeb5a3588e3f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -84,6 +84,7 @@ let platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ maintainers.vcunat ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; }; diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 68acbb83531e..75fce129e934 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -48,5 +48,6 @@ in stdenv.mkDerivation rec { downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index a5577b97b870..b314e8db8379 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f"; }; - configureFlags = "--sysconfdir=/etc"; + configureFlags = [ "--sysconfdir=/etc" ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 1a7a31d978af..f0f706157ed1 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { buildInputs = [ intltool utillinux ]; - configureFlags = "" - + " --with-media-dir=${mediaDir}" - + " --with-lock-dir=${lockDir}" - + " --with-whitelist=${whiteList}" - + " --with-mount-prog=${utillinux}/bin/mount" - + " --with-umount-prog=${utillinux}/bin/umount" - + " --with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g"; + configureFlags = [ + "--with-media-dir=${mediaDir}" + "--with-lock-dir=${lockDir}" + "--with-whitelist=${whiteList}" + "--with-mount-prog=${utillinux}/bin/mount" + "--with-umount-prog=${utillinux}/bin/umount" + "--with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g" + ]; postConfigure = '' # etc/Mafile.am is hardcoded and it does not respect the --prefix option. @@ -33,6 +34,8 @@ stdenv.mkDerivation rec { substituteInPlace ./src/Makefile --replace '-o root -g root -m 4755 ' '-m 755 ' ''; + doCheck = false; # fails 1 out of 1 tests with "Error: could not open fstab-type file: No such file or directory" + meta = { homepage = http://pmount.alioth.debian.org/; description = "Mount removable devices as normal user"; diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 5408c4237ec4..1031cc9a56ed 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "powerstat-${version}"; - version = "0.02.17"; + version = "0.02.18"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"; - sha256 = "1lxzrvwlf6h35i0d8v1yj1ka63i9i0yvv3adhy3pa3fl8arpvycs"; + sha256 = "1glryfmq9h7h8hsasg5ffl9vrcbjkkq3xqdxmbdhxmn137w7vgm5"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 358fa700382f..c7b71d4e5018 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - name = "psmisc-23.1"; + name = "psmisc-23.2"; src = fetchurl { url = "mirror://sourceforge/psmisc/${name}.tar.xz"; - sha256 = "0c5s94hqpwfmyswx2f96gifa6wdbpxxpkyxcrlzbxpvmrxsd911f"; + sha256 = "0s1kjhrik0wzqbm7hv4gkhywhjrwhp9ajw0ad05fwharikk6ah49"; }; buildInputs = [ncurses]; @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { homepage = http://psmisc.sourceforge.net/; description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index 0263d17ead02..b1e01f705dcf 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ nukeReferences ]; makeFlags = concatStringsSep " " [ - "ARCH=${stdenv.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way. + "ARCH=${stdenv.hostPlatform.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way. "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us. ]; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 3a76450a8308..885ea3421f65 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -20,13 +20,13 @@ in stdenv.mkDerivation rec { name = "shadow-${version}"; - version = "4.5"; + version = "4.6"; src = fetchFromGitHub { owner = "shadow-maint"; repo = "shadow"; rev = "${version}"; - sha256 = "1aj7s2arnsfqf34ak40is2zmwm666l28pay6rv1ffx46j0wj4hws"; + sha256 = "1llcv77lvpc4h3rgww9ms736kbdisiylcr2z02863f41afxbwl82"; }; buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; @@ -81,10 +81,11 @@ stdenv.mkDerivation rec { mv $out/bin/su $su/bin ''; - meta = { - homepage = http://pkg-shadow.alioth.debian.org/; + meta = with stdenv.lib; { + homepage = https://github.com/shadow-maint; description = "Suite containing authentication-related tools such as passwd and su"; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + platforms = platforms.linux; }; passthru = { diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index a07eec431c33..ede8d425f12d 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { description = "A memory usage reporting tool that takes shared memory into account"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eelco ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 880da81c42e0..146e1c276965 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -6,78 +6,52 @@ with stdenv.lib; -let - common = { version - , sha256 - , rev ? "spl-${version}" - , broken ? false - , patches ? [] - }: stdenv.mkDerivation rec { - name = "spl-${version}-${kernel.version}"; +assert kernel != null; - src = fetchFromGitHub { - owner = "zfsonlinux"; - repo = "spl"; - inherit rev sha256; - }; +stdenv.mkDerivation rec { + name = "spl-${version}-${kernel.version}"; + version = "0.7.9"; - inherit patches; + src = fetchFromGitHub { + owner = "zfsonlinux"; + repo = "spl"; + rev = "spl-${version}"; + sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0"; + }; - nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; + patches = [ ./install_prefix.patch ]; - hardeningDisable = [ "fortify" "stackprotector" "pic" ]; + nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; - preConfigure = '' - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid - substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" - substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - ''; + hardeningDisable = [ "fortify" "stackprotector" "pic" ]; - configureFlags = [ - "--with-config=kernel" - "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" - "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; + preConfigure = '' + substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid + substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" + substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + ''; - enableParallelBuilding = true; + configureFlags = [ + "--with-config=kernel" + "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" + "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + enableParallelBuilding = true; - longDescription = '' - This kernel module is a porting layer for ZFS to work inside the linux - kernel. - ''; + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - inherit broken; + longDescription = '' + This kernel module is a porting layer for ZFS to work inside the linux + kernel. + ''; - homepage = http://zfsonlinux.org/; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; - }; + homepage = http://zfsonlinux.org/; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; -in - assert kernel != null; -{ - splStable = common { - version = "0.7.9"; - sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0"; - patches = [ ./install_prefix-0.7.9.patch ]; - }; - - splUnstable = common { - version = "2018-05-07"; - rev = "1149b62d20b7ed9d8ae25d5da7a06213d79b7602"; - sha256 = "07qlx7l23y696gzyy7ynly7n1141w66y21gkmxiia2xwldj8klkx"; - patches = [ ./install_prefix.patch ]; - }; - - splLegacyCrypto = common { - version = "2018-01-24"; - rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771"; - sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h"; - patches = [ ./install_prefix.patch ]; - }; } diff --git a/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch b/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch deleted file mode 100644 index 114ca1231470..000000000000 --- a/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch +++ /dev/null @@ -1,162 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 4977448..ac17217 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,10 +12,10 @@ endif - if CONFIG_KERNEL - SUBDIRS += module - --extradir = @prefix@/src/spl-$(VERSION) -+extradir = @prefix@/libexec/spl - extra_HEADERS = spl.release.in spl_config.h.in - --kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION) -+kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION) - nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) - endif - -diff --git a/include/Makefile.am b/include/Makefile.am -index 3200222..4a47aaa 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -13,6 +13,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include -+kerneldir = @prefix@/libexec/spl/include - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am -index e0da4b3..d6d7af0 100644 ---- a/include/fs/Makefile.am -+++ b/include/fs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/fs -+kerneldir = @prefix@/libexec/spl/include/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index 712e94e..4af9fb7 100644 ---- a/include/linux/Makefile.am -+++ b/include/linux/Makefile.am -@@ -18,6 +18,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/linux -+kerneldir = @prefix@/libexec/spl/include/linux - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am -index cfc8246..4fbd33d 100644 ---- a/include/rpc/Makefile.am -+++ b/include/rpc/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc -+kerneldir = @prefix@/libexec/spl/include/rpc - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am -index 10e7093..febecdf 100644 ---- a/include/sharefs/Makefile.am -+++ b/include/sharefs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs -+kerneldir = @prefix@/libexec/spl/include/sharefs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am -index 73c4a84..31a9f50 100644 ---- a/include/sys/Makefile.am -+++ b/include/sys/Makefile.am -@@ -107,7 +107,7 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys -+kerneldir = @prefix@/libexec/spl/include/sys - kernel_HEADERS = $(KERNEL_H) - endif - -diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am -index 2821cbe..a84ce8e 100644 ---- a/include/sys/fm/Makefile.am -+++ b/include/sys/fm/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm -+kerneldir = @prefix@/libexec/spl/include/sys/fm - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am -index 581083e..0c35fb7 100644 ---- a/include/sys/fs/Makefile.am -+++ b/include/sys/fs/Makefile.am -@@ -8,6 +8,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs -+kerneldir = @prefix@/libexec/spl/include/sys/fs - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/util/Makefile.am b/include/util/Makefile.am -index e2bf09f..3f5d6ce 100644 ---- a/include/util/Makefile.am -+++ b/include/util/Makefile.am -@@ -9,6 +9,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/util -+kerneldir = @prefix@/libexec/spl/include/util - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am -index 7faab0a..8148b3d 100644 ---- a/include/vm/Makefile.am -+++ b/include/vm/Makefile.am -@@ -10,6 +10,6 @@ USER_H = - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - - if CONFIG_KERNEL --kerneldir = @prefix@/src/spl-$(VERSION)/include/vm -+kerneldir = @prefix@/libexec/spl/include/vm - kernel_HEADERS = $(KERNEL_H) - endif -diff --git a/module/Makefile.in b/module/Makefile.in -index d4e62e1..73fa01c 100644 ---- a/module/Makefile.in -+++ b/module/Makefile.in -@@ -21,15 +21,15 @@ clean: - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ -- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ -+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ - INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ - KERNELRELEASE=@LINUX_VERSION@ - @# Remove extraneous build products when packaging -- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -- if [ -n "$(DESTDIR)" ]; then \ -+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ -+ if [ -n "@prefix@" ]; then \ - find $$kmoddir -name 'modules.*' | xargs $(RM); \ - fi -- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ -+ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index 67df9dd2f11f..376ae47ffbe0 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -19,5 +19,6 @@ multiStdenv.mkDerivation { meta = with multiStdenv.lib; { description = "Tool for creating static Linux binaries"; platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix index a5c69e1d876e..c7543aee9337 100644 --- a/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "syscall_limiter-${version}"; - version = "20170123"; + version = "2017-01-23"; src = fetchFromGitHub { owner = "vi"; @@ -16,11 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0z5arj1kq1xczgrbw1b8m9kicbv3vs9bd32wvgfr4r6ndingsp5m"; }; - configurePhase = ""; - - buildPhase = '' - make CC="gcc -I${libseccomp}/include -L${libseccomp}/lib" - ''; + buildInputs = [ libseccomp ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index cdb1910d9c0e..9b0f3ff767c2 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc}: +{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils}: with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.21.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "0dakxv2pkbsivavz09fwvav4dla7qzklnv45zb7x306gankkjgi1"; + sha256 = "1wbvpsalm2ccwh8xz6fa4gqviilvjd8lnwvdryixhsdsf7j8w0j0"; }; buildInputs = [ - cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc + cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc elfutils ] ++ optional (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; license = licenses.gpl2; maintainers = [maintainers.raskin]; - platforms = platforms.linux ++ platforms.darwin; + platforms = ["x86_64-linux"] ++ platforms.darwin; downloadPage = "https://github.com/draios/sysdig/releases"; }; } diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 8a87d3fce580..f02f1baafe63 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -21,19 +21,23 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ nasm perl python ]; - buildInputs = [ libuuid makeWrapper ]; - - enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...' - hardeningDisable = [ "pic" "stackprotector" "fortify" ]; - - preBuild = '' + postPatch = '' substituteInPlace Makefile --replace /bin/pwd $(type -P pwd) substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo) substituteInPlace utils/ppmtolss16 --replace /usr/bin/perl $(type -P perl) substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) + + # fix tests + substituteInPlace tests/unittest/include/unittest/unittest.h \ + --replace /usr/include/ "" ''; + nativeBuildInputs = [ nasm perl python ]; + buildInputs = [ libuuid makeWrapper ]; + + enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...' + hardeningDisable = [ "pic" "stackprotector" "fortify" ]; + stripDebugList = "bin sbin share/syslinux/com32"; makeFlags = [ @@ -47,6 +51,8 @@ stdenv.mkDerivation rec { "bios" ]; + doCheck = false; # fails. some fail in a sandbox, others require qemu + postInstall = '' wrapProgram $out/bin/syslinux \ --prefix PATH : "${mtools}/bin" diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 0da32371b351..5f3eb22f127e 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-11.7.4"; + name = "sysstat-12.0.1"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "144h5fb93s33w3pmgw7qadw1f7c4jq41m5lzcs49ihl44yi6aqm9"; + sha256 = "114wh7iqi82c0az8wn3dg3y56279fb2wg81v8kvx87mq5975bg51"; }; buildInputs = [ gettext ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index abb6efa29bfb..912ba5b5e0ef 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -19,7 +19,7 @@ let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); in stdenv.mkDerivation rec { - version = "238"; + version = "239"; name = "systemd-${version}"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -27,8 +27,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "02042d012c4d6c0a2854d8436dd6636d4327774f"; - sha256 = "0iv6fygzac0z6dagbmw1nf8dx7rrr6d9cxp0fr304rn3ir58g5f0"; + rev = "67c553805a9ebee2dce7c3a350b4abd4d7a489c2"; + sha256 = "114vq71gcddi4qm2hyrj5jsas9599s0h5mg65jfpvxhfyaw54cpv"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -145,16 +145,6 @@ in stdenv.mkDerivation rec { --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" ''; - patches = [ - # https://github.com/systemd/systemd/pull/8580 - (fetchpatch { - url = https://github.com/systemd/systemd/pull/8580.patch; - sha256 = "1yp07hlpgqq0h2y0qc3kasswzkycz6p8d56d695ck1qa2f5bdfgn"; - }) - ]; - - hardeningDisable = [ "stackprotector" ]; - NIX_CFLAGS_COMPILE = [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would # lead to a cyclic dependency. @@ -208,10 +198,11 @@ in stdenv.mkDerivation rec { # runtime; otherwise we can't and we need to reboot. passthru.interfaceVersion = 2; - meta = { + meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/systemd; description = "A system and service manager for Linux"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; }; } diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index b516cfe65edd..2e8cf0125e55 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -33,12 +33,13 @@ stdenv.mkDerivation { rm -rf $out/include rm -rf $out/share/man/man5 rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5') - rm $out/bin/{mountpoint,wall} $out/share/man/man1/{mountpoint.1,wall.1} + rm $out/bin/wall $out/share/man/man1/wall.1 ''; meta = { homepage = http://www.nongnu.org/sysvinit/; description = "Utilities related to booting and shutdown"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index fec70e8c485e..b6eb2f1150a9 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -59,5 +59,6 @@ in stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; priority = -1; + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 46b09dce4379..54d9a9bafe97 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { name = "trinity-${version}"; - version = "1.8-git-2017-02-13"; + version = "1.8-git-2018-06-08"; src = fetchFromGitHub { owner = "kernelslacker"; repo = "trinity"; - rev = "2989c11ce77bc7bec23da62987e2c3a0dd8a83c9"; - sha256 = "19asyrypjhx2cgjdmwfvmgc0hk3xg00zvgkl89vwxngdb40bkwfq"; + rev = "1b2d43cb383cef86a05acb2df046ce5e9b17a7fe"; + sha256 = "0dsq10vmd6ii1dnpaqhizk9p8mbd6mwgpmi13b11dxwxpcvbhlar"; }; # Fails on 32-bit otherwise - NIX_CFLAGS_COMPILE = "-Wno-error"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=int-to-pointer-cast" + "-Wno-error=pointer-to-int-cast" + "-Wno-error=incompatible-pointer-types" + ]; postPatch = '' patchShebangs ./configure @@ -21,11 +25,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installPhase = "make DESTDIR=$out install"; + makeFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { description = "A Linux System call fuzz tester"; - homepage = http://codemonkey.org.uk/projects/trinity/; + homepage = https://codemonkey.org.uk/projects/trinity/; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 199523db4281..bdc6a63f0697 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - configureFlags = "--localstatedir=/var --enable-lvm2"; + configureFlags = [ "--localstatedir=/var" "--enable-lvm2" ]; meta = { homepage = http://www.freedesktop.org/wiki/Software/udisks; diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix new file mode 100644 index 000000000000..e9c033acd990 --- /dev/null +++ b/pkgs/os-specific/linux/undervolt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + version = "0.2.8"; + pname = "undervolt"; + + src = fetchFromGitHub { + owner = "georgewhewell"; + repo = "undervolt"; + rev = "${version}"; + sha256 = "0crkqc5zq0gpyg031hfwdxymfc2gc1h8b6m0axzlh7gvnxlf5hra"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/georgewhewell/undervolt/; + description = "A program for undervolting Intel CPUs on Linux"; + + longDescription = '' + Undervolt is a program for undervolting Intel CPUs under Linux. It works in a similar + manner to the Windows program ThrottleStop (i.e, MSR 0x150). You can apply a fixed + voltage offset to one of 5 voltage planes, and override your systems temperature + target (CPU will throttle when this temperature is reached). + ''; + license = licenses.gpl2; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix index 91443eeced58..739bd4471927 100644 --- a/pkgs/os-specific/linux/untie/default.nix +++ b/pkgs/os-specific/linux/untie/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { description = "A tool to run processes untied from some of the namespaces"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; passthru = { diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index c4af0bec9a23..629f61bf5b16 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { homepage = https://upower.freedesktop.org/; description = "A D-Bus service for power management"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index d2f75f5875ea..55758190efd6 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -22,16 +22,14 @@ in stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; postPatch = '' + patchShebangs tests/run.sh + substituteInPlace include/pathnames.h \ --replace "/bin/login" "${shadow}/bin/login" substituteInPlace sys-utils/eject.c \ --replace "/bin/umount" "$out/bin/umount" ''; - preConfigure = lib.optionalString (systemd != null) '' - configureFlags+=" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/" - ''; - # !!! It would be better to obtain the path to the mount helpers # (/sbin/mount.*) through an environment variable, but that's # somewhat risky because we have to consider that mount can setuid @@ -43,8 +41,11 @@ in stdenv.mkDerivation rec { "--disable-use-tty-group" "--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin" "--disable-makeinstall-setuid" "--disable-makeinstall-chown" - ] ++ lib.optional (ncurses == null) "--without-ncurses" - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + (lib.withFeature (ncurses != null) "ncursesw") + (lib.withFeature (systemd != null) "systemd") + (lib.withFeatureAs (systemd != null) + "systemdsystemunitdir" "$(bin)/lib/systemd/system/") + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "scanf_cv_type_modifier=ms" ; @@ -55,6 +56,8 @@ in stdenv.mkDerivation rec { [ zlib pam ] ++ lib.filter (p: p != null) [ ncurses systemd perl ]; + doCheck = false; # "For development purpose only. Don't execute on production system!" + postInstall = '' rm "$bin/bin/su" # su should be supplied by the su package (shadow) '' + lib.optionalString minimal '' diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index add7c6488562..3b19b7bff544 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -80,7 +80,8 @@ stdenv.mkDerivation rec { patches = [ ./build-fix.patch - #KRACKAttack.com + + # KRACKAttack.com (fetchurl { url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; @@ -113,6 +114,12 @@ stdenv.mkDerivation rec { url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; }) + + # Unauthenticated EAPOL-Key decryption (CVE-2018-14526) + (fetchurl { + url = "https://w1.fi/security/2018-1/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch"; + sha256 = "0z0zxc9wrikmvciyqpdhx0l5v7qsd8c6b5ph9h5rniqllpr3q34n"; + }) ]; postInstall = '' diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 45edf8945c0e..c689faad492f 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -9,7 +9,7 @@ , gawk, gnugrep, gnused, systemd # Kernel dependencies -, kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null +, kernel ? null, spl ? null }: with stdenv.lib; @@ -51,7 +51,7 @@ let ''; nativeBuildInputs = [ autoreconfHook nukeReferences ] - ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); + ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] @@ -93,7 +93,7 @@ let configureFlags = [ "--with-config=${configFile}" - ] ++ optionals buildUser [ + ] ++ optionals buildUser [ "--with-dracutdir=$(out)/lib/dracut" "--with-udevdir=$(out)/lib/udev" "--with-systemdunitdir=$(out)/etc/systemd/system" @@ -103,10 +103,11 @@ let "--sysconfdir=/etc" "--localstatedir=/var" "--enable-systemd" - ] ++ optionals buildKernel [ - "--with-spl=${spl}/libexec/spl" + ] ++ optionals buildKernel [ "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ] ++ optionals (buildKernel && spl != null) [ + "--with-spl=${spl}/libexec/spl" ]; enableParallelBuilding = true; @@ -157,7 +158,7 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.18"; # this package should point to the latest release. version = "0.7.9"; @@ -179,43 +180,19 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-05-22"; - - rev = "ba863d0be4cbfbea938b10e49fb6ff459ac9ec20"; - sha256 = "11dhigw1gybalwg2m6si148b6w195dj2lw38snqf6576wb5zndd0"; - isUnstable = true; - - extraPatches = [ - (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-02-02.patch"; - sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch"; - }) - ]; - - spl = splUnstable; - }; - - # TODO: Remove this module before 18.09 - # also remove boot.zfs.enableLegacyCrypto - zfsLegacyCrypto = common { - # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; - - # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-02-01"; + version = "2018-08-13"; - rev = "4c46b99d24a6e71b3c72462c11cb051d0930ad60"; - sha256 = "011lcp2x44jgfzqqk2gjmyii1v7rxcprggv20prxa3c552drsx3c"; + rev = "64e96969a88c21aebb2f8d982a8c345e55a2ae6c"; + sha256 = "164fvsf9zqvq3vafnvjxafjl8gihmfqfsjwsmky16i90a6hs96gf"; isUnstable = true; extraPatches = [ (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/4c46b99d24a6e71b3c72462c11cb051d0930ad60...nixos-zfs-2018-02-01.patch"; - sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch"; + url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-08-13.patch"; + sha256 = "1sdcr1w2jp3djpwlf1f91hrxxmc34q0jl388smdkxh5n5bpw5gzw"; }) ]; - spl = splLegacyCrypto; + spl = null; }; - } |