diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-04-05 13:13:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-05 13:13:21 +0200 |
commit | e50c67ad7eefa8e77436fbd0366b69638b1c8713 (patch) | |
tree | 0b5038414bb6f38e649f9eb53133d2fb2eca6c72 /pkgs/os-specific | |
parent | df77ecc99d0ee7555bc6353e6eef592409d5d855 (diff) | |
parent | 866c5aa090d8f4c7f6e1b983531b7b8be4d354ac (diff) |
Merge pull request #83618 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/apparmor/cross.patch | 19 | ||||
-rw-r--r-- | pkgs/os-specific/linux/apparmor/default.nix | 11 | ||||
-rw-r--r-- | pkgs/os-specific/linux/bcc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/bluez/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/ffado/default.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/linux/iproute/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/net-tools/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/plymouth/default.nix | 50 | ||||
-rw-r--r-- | pkgs/os-specific/linux/rdma-core/default.nix | 9 | ||||
-rw-r--r-- | pkgs/os-specific/linux/udisks/2-default.nix | 8 |
10 files changed, 51 insertions, 70 deletions
diff --git a/pkgs/os-specific/linux/apparmor/cross.patch b/pkgs/os-specific/linux/apparmor/cross.patch deleted file mode 100644 index f7e95ecfb4049..0000000000000 --- a/pkgs/os-specific/linux/apparmor/cross.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/parser/libapparmor_re/Makefile 2018-10-14 07:38:06.000000000 +0800 -+++ b/parser/libapparmor_re/Makefile 2019-06-28 16:16:33.741916660 +0800 -@@ -10,6 +10,7 @@ - - TARGET=libapparmor_re.a - -+AR ?= ar - CFLAGS ?= -g -Wall -O2 ${EXTRA_CFLAGS} -std=gnu++0x - CXXFLAGS := ${CFLAGS} ${INCLUDE_APPARMOR} - -@@ -22,7 +23,7 @@ - UNITTESTS = tst_parse - - libapparmor_re.a: parse.o expr-tree.o hfa.o chfa.o aare_rules.o -- ar ${ARFLAGS} $@ $^ -+ ${AR} ${ARFLAGS} $@ $^ - - expr-tree.o: expr-tree.cc expr-tree.h - diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index ed6a64a25ee83..d661b2172b3ce 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -14,7 +14,7 @@ let apparmor-series = "2.13"; - apparmor-patchver = "3"; + apparmor-patchver = "4"; apparmor-version = apparmor-series + "." + apparmor-patchver; apparmor-meta = component: with stdenv.lib; { @@ -27,7 +27,7 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "0fbnk9fzjsffwcijsv2wwykmybvfdckpqk99qlib3kb89him6w16"; + sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh"; }; prePatchCommon = '' @@ -49,13 +49,6 @@ let sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4"; }) # (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12) - ] ++ [ - ./cross.patch - # Support Python 3.8 - (fetchpatch { - url = https://gitlab.com/apparmor/apparmor/commit/ccbf1e0bf1bf5c3bbab47029fbbc5415ef73bac1.patch; - sha256 = "0kfzc0wyjybj38n10yvwakaaqvglalzigd3kk7gcrbp1xdn70pq2"; - }) ]; # Set to `true` after the next FIXME gets fixed or this gets some diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 949d953c3bd5b..585ab6ec72539 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -4,8 +4,8 @@ }: python.pkgs.buildPythonApplication rec { + pname = "bcc"; version = "0.13.0"; - name = "bcc-${version}"; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 844a9faf739c8..29b100a33c526 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "bluez"; - version = "5.53"; + version = "5.54"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "1g1qg6dz6hl3csrmz75ixr12lwv836hq3ckb259svvrg62l2vaiq"; + sha256 = "1p2ncvjz6alr9n3l5wvq2arqgc7xjs6dqyar1l9jp0z8cfgapkb8"; }; pythonPath = with python3.pkgs; [ diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 43f9f44c901af..5dc5086a8c619 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -43,7 +43,15 @@ mkDerivation rec { outputs = [ "out" "bin" "dev" ]; - nativeBuildInputs = [ desktop-file-utils scons pkgconfig which python pyqt5 wrapQtAppsHook ]; + nativeBuildInputs = [ + desktop-file-utils + scons.py2 + pkgconfig + which + python + pyqt5 + wrapQtAppsHook + ]; prefixKey = "PREFIX="; sconsFlags = [ diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 8e753121b7f02..624644596d94b 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf }: +{ fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf, libmnl }: stdenv.mkDerivation rec { pname = "iproute2"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "CONFDIR=$(out)/etc/iproute2" ]; - buildInputs = [ db iptables libelf ]; + buildInputs = [ db iptables libelf libmnl ]; nativeBuildInputs = [ bison flex pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 3cd8f224ce46f..7b1a0234a4f54 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "net-tools"; - version = "1.60_p20170221182432"; + version = "1.60_p20180626073013"; src = fetchurl { url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; - sha256 = "08r4r2a24g5bm8jwgfa998gs1fld7fgbdf7pilrpsw1m974xn04a"; + sha256 = "0mzsjjmz5kn676w2glmxwwd8bj0xy9dhhn21aplb435b767045q4"; }; preBuild = diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index b074c6d724438..1a8e3685e9c76 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -26,34 +26,32 @@ stdenv.mkDerivation rec { -e "s#plymouththemedir=.*#plymouththemedir=/etc/plymouth/themes#" \ -e "s#plymouthpolicydir=.*#plymouthpolicydir=/etc/plymouth/#" \ configure.ac + ''; - configureFlags=" - --prefix=$out - --bindir=$out/bin - --sbindir=$out/sbin - --exec-prefix=$out - --libdir=$out/lib - --libexecdir=$out/lib - --sysconfdir=/etc - --with-systemdunitdir=$out/etc/systemd/system - --localstatedir=/var - --with-logo=/etc/plymouth/logo.png - --with-background-color=0x000000 - --with-background-start-color-stop=0x000000 - --with-background-end-color-stop=0x000000 - --with-release-file=/etc/os-release - --without-system-root-install - --without-rhgb-compat-link - --enable-tracing - --enable-systemd-integration - --enable-pango - --enable-gdm-transition - --enable-gtk" + configureFlags = [ + "--sysconfdir=/etc" + "--with-systemdunitdir=${placeholder "out"}/etc/systemd/system" + "--localstatedir=/var" + "--with-logo=/etc/plymouth/logo.png" + "--with-background-color=0x000000" + "--with-background-start-color-stop=0x000000" + "--with-background-end-color-stop=0x000000" + "--with-release-file=/etc/os-release" + "--without-system-root-install" + "--without-rhgb-compat-link" + "--enable-tracing" + "--enable-systemd-integration" + "--enable-pango" + "--enable-gdm-transition" + "--enable-gtk" + ]; - installFlags=" - plymouthd_defaultsdir=$out/share/plymouth - plymouthd_confdir=$out/etc/plymouth" - ''; + configurePlatforms = [ "host" ]; + + installFlags = [ + "plymouthd_defaultsdir=$(out)/share/plymouth" + "plymouthd_confdir=$(out)/etc/plymouth" + ]; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/Plymouth; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index b16b230ce27d0..1d505523c5096 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "27.0"; + version = "28.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "04mhcrcmbwxcjhswlkhnr6m5nl2389jgjv6aqhd4v0x555cwnfvw"; + sha256 = "0az2is6p5gkyphi2b978kwn7knry60y33kn6p7cxz49ca79a42cy"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; @@ -26,11 +26,6 @@ in stdenv.mkDerivation { ]; postPatch = '' - substituteInPlace providers/rxe/rxe_cfg.in \ - --replace ethtool "${ethtool}/bin/ethtool" \ - --replace 'ip addr' "${iproute}/bin/ip addr" \ - --replace 'ip link' "${iproute}/bin/ip link" - substituteInPlace srp_daemon/srp_daemon.sh.in \ --replace /bin/rm rm ''; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 1d967b38eb96c..526def78bb2ce 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, libtool, pkgconfig, gettext, gnused +{ stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkgconfig, gettext, gnused , gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which , expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted , gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43, autoconf, automake @@ -37,6 +37,12 @@ stdenv.mkDerivation rec { xfsprogs ntfs3g parted utillinux ]; }) + + # Fix tests: https://github.com/storaged-project/udisks/issues/724 + (fetchpatch { + url = "https://github.com/storaged-project/udisks/commit/60a0c1c967821d317046d9494e45b9a8e4e7a1c1.patch"; + sha256 = "tWl49mSc1zDyB3kV6SKlhHFPi/Kg7mg6OWDlY7vGj2Y="; + }) ]; nativeBuildInputs = [ |