diff options
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux')
19 files changed, 167 insertions, 117 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index d77053f5d397..4903eadef4b5 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -1,36 +1,8 @@ -From 44887227f7f617cbf84713ec45685cb4999039ff Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -Date: Tue, 30 Oct 2018 22:26:30 +0100 -Subject: [PATCH] build: Add option for installation sysconfdir - -On NixOS, sysconfdir is read-only by default, and packages are not supposed to -install files there. Instead, NixOS has a concept of modules that declaratively -describe the system configuration. - -We still want to install the config files and certificates to fwupd prefix, -so that the modules can use them as they see fit, but at the same time, we -cannot set sysconfdir=${prefix}/etc because the daemon needs to read the -configuration from the directory created by the module. - -With autotools, we could easily solve this by passing a the sysconfdir inside -prefix only to `make install`, but Meson does not support anything like that. -Until we manage to convince Meson to support install flags, we need to create -our own install flag. ---- - data/meson.build | 4 ++-- - data/pki/meson.build | 8 ++++---- - data/remotes.d/meson.build | 6 +++--- - meson.build | 6 ++++++ - meson_options.txt | 1 + - plugins/redfish/meson.build | 2 +- - plugins/uefi/meson.build | 2 +- - 7 files changed, 18 insertions(+), 11 deletions(-) - diff --git a/data/meson.build b/data/meson.build -index 8dd2ac9a..d4ad1cbc 100644 +index 61664cd6..f10abbba 100644 --- a/data/meson.build +++ b/data/meson.build -@@ -9,7 +9,7 @@ if get_option('tests') and get_option('daemon') +@@ -11,7 +11,7 @@ if get_option('daemon') endif install_data(['daemon.conf'], @@ -39,7 +11,7 @@ index 8dd2ac9a..d4ad1cbc 100644 ) install_data(['org.freedesktop.fwupd.metainfo.xml'], -@@ -17,7 +17,7 @@ install_data(['org.freedesktop.fwupd.metainfo.xml'], +@@ -23,7 +23,7 @@ install_data(['org.freedesktop.fwupd.svg'], ) install_data(['org.freedesktop.fwupd.conf'], @@ -47,7 +19,7 @@ index 8dd2ac9a..d4ad1cbc 100644 + install_dir : join_paths(sysconfdir_install, 'dbus-1', 'system.d') ) - install_data(['metadata.xml'], + if get_option('daemon') diff --git a/data/pki/meson.build b/data/pki/meson.build index eefcc914..dc801fa1 100644 --- a/data/pki/meson.build @@ -85,7 +57,7 @@ index eefcc914..dc801fa1 100644 endif diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build -index 824291fc..d0599a00 100644 +index a27c31ef..374e09b6 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build @@ -3,7 +3,7 @@ if get_option('daemon') and get_option('lvfs') @@ -98,22 +70,22 @@ index 824291fc..d0599a00 100644 i18n.merge_file( input: 'lvfs.metainfo.xml', @@ -37,12 +37,12 @@ configure_file( - output : 'fwupd.conf', + output : 'vendor.conf', configuration : con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) configure_file( - input : 'vendor.conf', - output : 'vendor.conf', + input : 'vendor-directory.conf', + output : 'vendor-directory.conf', configuration : con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index b6df98b3..d672ee37 100644 +index a89f9b3f..736896eb 100644 --- a/meson.build +++ b/meson.build @@ -145,6 +145,12 @@ localstatedir = join_paths(prefix, get_option('localstatedir')) @@ -130,22 +102,33 @@ index b6df98b3..d672ee37 100644 if gio.version().version_compare ('>= 2.55.0') conf.set('HAVE_GIO_2_55_0', '1') diff --git a/meson_options.txt b/meson_options.txt -index 23ef8cdb..db8f93b6 100644 +index 5d4163e8..db81fd1f 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -17,6 +17,7 @@ option('plugin_uefi', type : 'boolean', value : true, description : 'enable UEFI - option('plugin_nvme', type : 'boolean', value : true, description : 'enable NVMe support') +@@ -21,6 +21,7 @@ option('plugin_modem_manager', type : 'boolean', value : false, description : 'e option('systemd', type : 'boolean', value : true, description : 'enable systemd support') option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units') + option('elogind', type : 'boolean', value : false, description : 'enable elogind support') +option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') option('tests', type : 'boolean', value : true, description : 'enable tests') option('udevdir', type: 'string', value: '', description: 'Directory for udev rules') option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules') +diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build +index cb9f4555..b972d7fb 100644 +--- a/plugins/dell-esrt/meson.build ++++ b/plugins/dell-esrt/meson.build +@@ -36,5 +36,5 @@ configure_file( + output : 'dell-esrt.conf', + configuration : con2, + install: true, +- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), ++ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), + ) diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index ef07bd81..d2c7e259 100644 +index 5c88504e..7706da71 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build -@@ -25,7 +25,7 @@ shared_module('fu_plugin_redfish', +@@ -26,7 +26,7 @@ shared_module('fu_plugin_redfish', ) install_data(['redfish.conf'], @@ -155,10 +138,10 @@ index ef07bd81..d2c7e259 100644 if get_option('tests') diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build -index 09ebdf82..02fc0661 100644 +index ac9f5dd8..1ab51b5e 100644 --- a/plugins/uefi/meson.build +++ b/plugins/uefi/meson.build -@@ -73,7 +73,7 @@ executable( +@@ -79,7 +79,7 @@ executable( ) install_data(['uefi.conf'], @@ -167,5 +150,3 @@ index 09ebdf82..02fc0661 100644 ) if get_option('tests') --- -2.19.1 diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix index cf6e2bf60407..a60417d8e231 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, substituteAll, gtk-doc, pkgconfig, gobject-introspection, intltool , libgudev, polkit, libxmlb, gusb, sqlite, libarchive, glib-networking -, libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales -, gnu-efi, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl +, libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, 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 , cairo, freetype, fontconfig, pango +, bubblewrap, efibootmgr, flashrom, tpm2-tools }: # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc @@ -18,17 +19,17 @@ let }; in stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.2.3"; + version = "1.2.8"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "11qpgincndahq96rbm2kgcy9kw5n9cmbbilsrqcqcyk7mvv464sl"; + sha256 = "0qbvq52c0scn1h99i1rf2la6rrhckin6gb02k7l0v3g07mxs20wc"; }; outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; nativeBuildInputs = [ - meson ninja gtk-doc pkgconfig gobject-introspection intltool glibcLocales shared-mime-info + meson ninja gtk-doc pkgconfig gobject-introspection intltool shared-mime-info valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook vala ]; buildInputs = [ @@ -37,10 +38,13 @@ in stdenv.mkDerivation rec { bash-completion cairo freetype fontconfig pango ]; - LC_ALL = "en_US.UTF-8"; # For po/make-images - patches = [ - ./fix-paths.patch + (substituteAll { + src = ./fix-paths.patch; + inherit flashrom efibootmgr bubblewrap; + tpm2_tools = "${tpm2-tools}"; + }) + ./add-option-for-installation-sysconfdir.patch # installed tests are installed to different output @@ -63,6 +67,10 @@ in stdenv.mkDerivation rec { substituteInPlace meson.build \ --replace "plugin_dir = join_paths(libdir, 'fwupd-plugins-3')" \ "plugin_dir = join_paths('${placeholder "out"}', 'fwupd_plugins-3')" + + substituteInPlace data/meson.build --replace \ + "install_dir: systemd.get_pkgconfig_variable('systemdshutdowndir')" \ + "install_dir: '${placeholder "out"}/lib/systemd/system-shutdown'" ''; # /etc/os-release not available in sandbox @@ -114,10 +122,11 @@ in stdenv.mkDerivation rec { # /etc/fwupd/uefi.conf is created by the services.hardware.fwupd NixOS module passthru = { filesInstalledToEtc = [ - "fwupd/remotes.d/fwupd.conf" + "fwupd/remotes.d/dell-esrt.conf" "fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" + "fwupd/remotes.d/vendor-directory.conf" "pki/fwupd/GPG-KEY-Hughski-Limited" "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch index d1024438d8a7..51adef2e7870 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch +++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch @@ -1,15 +1,71 @@ +diff --git a/data/builder/meson.build b/data/builder/meson.build +index c7a430c0..e69de29b 100644 --- a/data/builder/meson.build +++ b/data/builder/meson.build @@ -1,3 +0,0 @@ -install_data('README.md', - install_dir : join_paths(localstatedir, 'lib', 'fwupd', 'builder') -) +diff --git a/meson_post_install.sh b/meson_post_install.sh +index 0cbb6f41..d757a81a 100755 --- a/meson_post_install.sh +++ b/meson_post_install.sh -@@ -11,6 +11,4 @@ +@@ -11,6 +11,4 @@ LOCALSTATEDIR=$2 echo 'Updating systemd deps' mkdir -p ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants ln -sf ../fwupd-offline-update.service ${DESTDIR}${SYSTEMDUNITDIR}/system-update.target.wants/fwupd-offline-update.service - echo 'Creating stateful directory' - mkdir -p ${DESTDIR}${LOCALSTATEDIR}/lib/fwupd #fi +diff --git a/plugins/flashrom/fu-plugin-flashrom.c b/plugins/flashrom/fu-plugin-flashrom.c +index 598e0c42..a0a2c4a7 100644 +--- a/plugins/flashrom/fu-plugin-flashrom.c ++++ b/plugins/flashrom/fu-plugin-flashrom.c +@@ -52,7 +52,7 @@ fu_plugin_startup (FuPlugin *plugin, GError **error) + g_autoptr(GError) error_local = NULL; + + /* we need flashrom from the host system */ +- data->flashrom_fn = fu_common_find_program_in_path ("flashrom", &error_local); ++ data->flashrom_fn = fu_common_find_program_in_path ("@flashrom@/bin/flashrom", &error_local); + + /* search for devices */ + hwids = fu_plugin_get_hwids (plugin); +diff --git a/plugins/uefi/fu-plugin-uefi.c b/plugins/uefi/fu-plugin-uefi.c +index 9293715c..e2e77c58 100644 +--- a/plugins/uefi/fu-plugin-uefi.c ++++ b/plugins/uefi/fu-plugin-uefi.c +@@ -416,7 +416,7 @@ fu_plugin_update (FuPlugin *plugin, + fu_plugin_add_report_metadata (plugin, "MissingCapsuleHeader", str); + + /* record boot information to system log for future debugging */ +- efibootmgr_path = fu_common_find_program_in_path ("efibootmgr", NULL); ++ efibootmgr_path = fu_common_find_program_in_path ("@efibootmgr@/bin/efibootmgr", NULL); + if (efibootmgr_path != NULL) { + if (!g_spawn_command_line_sync ("efibootmgr -v", + &boot_variables, NULL, NULL, error)) +diff --git a/plugins/uefi/fu-uefi-pcrs.c b/plugins/uefi/fu-uefi-pcrs.c +index 5c7e5239..01acbf7f 100644 +--- a/plugins/uefi/fu-uefi-pcrs.c ++++ b/plugins/uefi/fu-uefi-pcrs.c +@@ -147,7 +147,7 @@ fu_uefi_pcrs_setup (FuUefiPcrs *self, GError **error) + /* old name, then new name */ + argv0 = fu_common_find_program_in_path ("tpm2_listpcrs", NULL); + if (argv0 == NULL) +- argv0 = fu_common_find_program_in_path ("tpm2_pcrlist", error); ++ argv0 = fu_common_find_program_in_path ("@tpm2_tools@/bin/tpm2_pcrlist", error); + if (argv0 == NULL) + return FALSE; + if (!fu_uefi_pcrs_setup_tpm20 (self, argv0, error)) +diff --git a/src/fu-common.c b/src/fu-common.c +index bd6faeef..45ba2a60 100644 +--- a/src/fu-common.c ++++ b/src/fu-common.c +@@ -436,7 +436,7 @@ fu_common_firmware_builder (GBytes *bytes, + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + + /* find bwrap in the path */ +- bwrap_fn = fu_common_find_program_in_path ("bwrap", error); ++ bwrap_fn = fu_common_find_program_in_path ("@bubblewrap@/bin/bwrap", error); + if (bwrap_fn == NULL) + return NULL; + diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/common.nix b/nixpkgs/pkgs/os-specific/linux/fuse/common.nix index f72b3cac7371..f829f1da424e 100644 --- a/nixpkgs/pkgs/os-specific/linux/fuse/common.nix +++ b/nixpkgs/pkgs/os-specific/linux/fuse/common.nix @@ -38,7 +38,10 @@ in stdenv.mkDerivation rec { outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common"; - mesonFlags = stdenv.lib.optional isFuse3 "-Dudevrulesdir=etc/udev/rules.d"; + mesonFlags = stdenv.lib.optionals isFuse3 [ + "-Dudevrulesdir=/udev/rules.d" + "-Duseroot=false" + ]; preConfigure = '' export MOUNT_FUSE_PATH=$out/sbin diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/default.nix b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix index a4dfda41a0ce..f48e528b486d 100644 --- a/nixpkgs/pkgs/os-specific/linux/fuse/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.6.1"; - sha256Hash = "1118r2nx64cpv9s5a6dgh49y0pnjcc5ybpkh5pigxf14bpqa26pb"; + version = "3.6.2"; + sha256Hash = "1cxx94q6zqns1iw5d4g3ll8f78swqxl6h25bpxmqkqsj6c91pzkl"; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch b/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch index 6f938536974a..147bcb439fb8 100644 --- a/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch +++ b/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch @@ -1,37 +1,18 @@ ---- a/util/install_helper.sh 2018-08-31 21:22:34.580563286 +0200 -+++ b/util/install_helper.sh 2018-08-31 21:30:54.837939149 +0200 -@@ -22,30 +22,11 @@ - DESTDIR="${DESTDIR%/}" +--- a/util/install_helper.sh 2019-07-10 12:00:15.984840142 +0200 ++++ b/util/install_helper.sh 2019-07-10 12:28:56.343011401 +0200 +@@ -37,10 +37,10 @@ fi --chown root:root "${DESTDIR}${bindir}/fusermount3" --chmod u+s "${DESTDIR}${bindir}/fusermount3" -- - install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \ - "${DESTDIR}${sysconfdir}/fuse.conf" - -- --if test ! -e "${DESTDIR}/dev/fuse"; then -- mkdir -p "${DESTDIR}/dev" -- mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229 --fi -- install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ - "${DESTDIR}${udevrulesdir}/99-fuse3.rules" -+ "${sysconfdir}/udev/rules.d/99-fuse3.rules" ++ "${sysconfdir}${udevrulesdir}/99-fuse3.rules" install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ - "${DESTDIR}${sysconfdir}/init.d/fuse3" -- -- --if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then -- /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true --else -- echo "== FURTHER ACTION REQUIRED ==" -- echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script" --fi -- -- +- "${DESTDIR}/etc/init.d/fuse3" ++ "${sysconfdir}/init.d/fuse3" + + + if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then diff --git a/util/meson.build b/util/meson.build index aa0e734..06d4378 100644 --- a/util/meson.build diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 30750c9f5d66..d3d2e2728a2d 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.132"; + version = "4.14.133"; # 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 = "0c7k5yl2h929kvbzqij0p56myp9v14im4s72wky5d9idfadg71ns"; + sha256 = "005pg4f8l2qz8g6hd71pj567z91hwjwdwb37h4dbb3fj6kjl965y"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index f38196fef7d1..b9d05c9fe6e8 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.57"; + version = "4.19.58"; # 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 = "11rz1pfphc4zkn3fbfavn1764g3ymp4b1bfnr7b630w8smcmfz1j"; + sha256 = "1waqk2ggnnaqa5pxhdbvxkkchvxxz9pbkqnr5pn5rj6h2v5644az"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index a80e578c75b0..1e3da9085196 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.184"; + version = "4.4.185"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jn3mwnfcvhnn0bqiyabkqii3rd6w5b982w3i085qj42q0pj6hv5"; + sha256 = "1ll694m5193dmwn8ys4sf2p6a6njd5pm38v862ih1iw7l3vj0l3s"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 4f054dcc6657..d611e4cf71e6 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.184"; + version = "4.9.185"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1bwzmmpc7k9n7p2s383pipdjc3hvqfbbacaxk7gdw9856pai8c83"; + sha256 = "16z3ijfzffpkp4mj42j3j8zbnpba1a67kd5cdqwb28spf32a66vc"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.1.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.1.nix index 85dc12c6b044..e0e64fdc5d4e 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.16"; + version = "5.1.17"; # 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/v5.x/linux-${version}.tar.xz"; - sha256 = "0gms4zkx97njzk1czsnih6jj9f6knismixxndn1h11vq7sz5agla"; + sha256 = "0gf4jqmq6b66jrlygmvn2z8xif3n83yq85jldbm3r257crww6dar"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.2.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.2.nix new file mode 100644 index 000000000000..094c5abf2442 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.2"; + + # 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/v5.x/linux-${version}.tar.xz"; + sha256 = "1ry11b5sc20jh7flnp94m20627jzl3l09rzmfjsk3a71fbv6dbal"; + }; +} // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/nmon/default.nix b/nixpkgs/pkgs/os-specific/linux/nmon/default.nix index bcb28995f0d2..5f425c9685cf 100644 --- a/nixpkgs/pkgs/os-specific/linux/nmon/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nmon/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses ]; - unpackPhase = ":"; + dontUnpack = true; buildPhase = "cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D X86"; installPhase = '' mkdir -p $out/bin diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh index a30f1d7f5936..467d930aaf58 100755 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -58,14 +58,16 @@ installPhase() { mkdir $i/lib/vdpau mv $i/lib/libvdpau* $i/lib/vdpau - # Install ICDs. - install -Dm644 nvidia.icd $i/etc/OpenCL/vendors/nvidia.icd + # Install ICDs, make absolute paths. + sed -E "s#(libnvidia-opencl)#$i/lib/\\1#" nvidia.icd > nvidia.icd.fixed + install -Dm644 nvidia.icd.fixed $i/etc/OpenCL/vendors/nvidia.icd if [ -e nvidia_icd.json.template ]; then - sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json + sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json fi if [ "$useGLVND" = "1" ]; then - install -Dm644 10_nvidia.json $i/share/glvnd/egl_vendor.d/nvidia.json + sed -E "s#(libEGL_nvidia)#$i/lib/\\1#" 10_nvidia.json > 10_nvidia.json.fixed + install -Dm644 10_nvidia.json.fixed $i/share/glvnd/egl_vendor.d/nvidia.json fi done diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index de6efdb0c2d9..3a80f4aa1de5 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { beta = stable; stable_430 = generic { - version = "430.26"; - sha256_64bit = "1rnfxl4dxa3jjidfdvfjmg1a8nc787ss15cakrp2wwrn8jlr9av6"; - settingsSha256 = "0rjsj697s9jfls7iz1hs7aqp36ihf3l82yz1x1w9wdvlw94a3nym"; - persistencedSha256 = "1n554i4g37hs49bb631x692ygfncn7a5hzb6mh9kx7hmv69yzazh"; + version = "430.34"; + sha256_64bit = "0c3x25gilibbgazvp20d5sfmmgcf0gfqf024nzzqryxg4m05h39b"; + settingsSha256 = "1xpf9gbpq5xynxm6f401ab09aa243h1sk2vcxvzjwqgcil36zzad"; + persistencedSha256 = "00dd0m87nwqfv9i23bvbqgcz10x9mvfxg9249nvhp4y3ha65rms6"; }; # Last one supporting x86 diff --git a/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix index 5de0081a411c..917652ca6f79 100644 --- a/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "pax-utils-${version}"; - version = "1.2.2"; + pname = "pax-utils"; + version = "1.2.4"; src = fetchurl { - url = "https://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha512 = "26f7lqr1s2iywj8qfbf24sm18bl6f7cwsf77nxwwvgij1z88gvh6yx3gp65zap92l0xjdp8kwq9y96xld39p86zd9dmkm447czykbvb"; + url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz"; + sha256 = "01kr6l2c3bhbgdrmwgzh6jk0jjkw3pi9xrzzl9cpn0ibyf68p1aj"; }; makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ELF utils that can check files for security relevant properties"; longDescription = '' A suite of ELF tools to aid auditing systems. Contains @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { for displaying PaX and security info on a large groups of binary files. ''; - homepage = https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities; + homepage = "https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice joachifm ]; diff --git a/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix b/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix index f9d6dc99db83..41dd3da9d31f 100644 --- a/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix +++ b/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix @@ -34,7 +34,7 @@ let in stdenv.mkDerivation { name = "rfkill-udev"; - unpackPhase = "true"; + dontUnpack = true; dontBuild = true; installPhase = '' diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 8e2864b4be16..39aa855e3cc5 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "5c20aab77900f478fd380ab189787d80e4a35963"; - sha256 = "0ldyhfxdy4qlgygvpc92wp0qp6p1c9y3rnm77zwbkga48x60d9i8"; + rev = "aa4c4d39d75ce52664cb28d569b1ceafda7b4c06"; + sha256 = "1ax94gzbdwdcf3wgj7f9cabdkvn2zynnnli7gkbz4isidlpis86g"; }; outputs = [ "out" "lib" "man" "dev" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix b/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix index 1d1712f6b476..33dbfe5bf0a7 100644 --- a/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ asciidoc libxslt ]; - configurePhase = "true"; + dontConfigure = true; buildPhase = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl all doc"; installPhase = "make prefix=$out install install_doc"; |