diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-19 14:53:29 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-19 14:53:29 +0100 |
commit | 5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4 (patch) | |
tree | c59afebc263ebb1693ae8c154164e5625c30ee76 /pkgs/os-specific | |
parent | 801d3b51f0ed2da1745c87eec8da2035d7dd5fb7 (diff) | |
parent | f6b39f852e0a9eb35a7434f02e5579c15519c41c (diff) | |
download | nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.gz nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.bz2 nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.lz nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.xz nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.zst nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix | 25 | ||||
-rw-r--r-- | pkgs/os-specific/linux/dpdk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/ell/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/hostapd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/iwd/default.nix | 9 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/microcode/intel.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/odp-dpdk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/pam_ccreds/default.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/pam_ldap/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/trace-cmd/kernelshark.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/gui.nix | 2 |
14 files changed, 50 insertions, 26 deletions
diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index 6f7caa8ec02..1df7070e7a3 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -63,10 +63,31 @@ stdenv.mkDerivation { # I'm guessing at the version here. https://github.com/apple/swift-corelibs-foundation/commit/df3ec55fe6c162d590a7653d89ad669c2b9716b1 imported "high sierra" # and this version is a version from there. No idea how accurate it is. LDFLAGS = "-current_version 1454.90.0 -compatibility_version 150.0.0 -init ___CFInitialize"; - configurePhase = "../configure release --sysroot UNUSED"; + + configurePhase = '' + ../configure release --sysroot UNUSED + ''; enableParallelBuilding = true; - buildPhase = "ninja -j $NIX_BUILD_CORES"; + + # FIXME: Workaround for intermittent build failures of CFRuntime.c. + # Based on testing this issue seems to only occur with clang_7, so + # please remove this when updating the default llvm versions to 8 or + # later. + buildPhase = stdenv.lib.optionalString true '' + for i in {1..512}; do + if ninjaBuildPhase; then + break + fi + + echo >&2 + echo "[$i/512] retrying build, workaround for #66811" >&2 + echo " With clang_7 the build of CFRuntime.c fails intermittently." >&2 + echo " See https://github.com/NixOS/nixpkgs/issues/66811 for more details." >&2 + echo >&2 + continue + done + ''; # TODO: their build system sorta kinda can do this, but it doesn't seem to work right now # Also, this includes a bunch of private headers in the framework, which is not what we want diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 9a74b0bb4a8..7525fc8e405 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}"; - version = "19.08"; + version = "19.08.2"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "0xgrkip2aji1c7jy5gk38zzwlp5ap1s6dmbcag5dnyy3bmwvmp9y"; + sha256 = "141bqqy4w6nzs9z70x7yv94a4gmxjfal46pxry9bwdh3zi1jwnyd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index a8776f688ca..bd0ddb4ce1d 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.24"; + version = "0.26"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "1dspi6ds58dy7g1q3chapxydfiyz8bjjlryq66jvwgpynzp0c1h1"; + sha256 = "1gnqd7dghwkcn48f6fr9qvkkm976b3x4bn3l7l2k9pamzpng084i"; }; patches = [ diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index e90470cd589..41d7f236682 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://hostap.epitest.fi; + homepage = https://hostap.epitest.fi; repositories.git = git://w1.fi/hostap.git; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 6d0eba0b0db..2ee5629451e 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -8,16 +8,17 @@ , docutils , readline , python3Packages +, systemd }: stdenv.mkDerivation rec { pname = "iwd"; - version = "0.22"; + version = "1.1"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "0mjc08ayq2k7sinqanrlm97dn88dxkqkyk2vqqcx1nqjvwvbpbsp"; + sha256 = "1rvsr5i79wpdicghplrxamb4qbkdm5cpgw3mk0rsqzwwj6d6l0vs"; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { ell python3Packages.python readline + systemd ]; pythonPath = [ @@ -46,6 +48,7 @@ stdenv.mkDerivation rec { "--with-dbus-datadir=${placeholder "out"}/share/" "--with-systemd-modloaddir=${placeholder "out"}/etc/modules-load.d/" # maybe "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/" + "--with-systemd-networkdir=${placeholder "out"}/lib/systemd/network/" ]; postUnpack = '' @@ -77,6 +80,6 @@ stdenv.mkDerivation rec { description = "Wireless daemon for Linux"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill fpletz ]; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index a6d9dbe1abe..35bd141ae46 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, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.201"; + version = "4.4.202"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "120kci4kmc48zcw16lhxmh71kaxm9ac5qxik36q3a20czg28b2m7"; + sha256 = "0adrmps7izfqy0yn4440isxvigslwzk1a375r9kh86idwbmcxb7x"; }; } // (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 3dc15168517..cb9d5a71dd9 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, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.201"; + version = "4.9.202"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "125xmh5h1zmfniidpjljny53qkl4phpxaali69i66lajscxx8grq"; + sha256 = "1gsfbvsswpwj6r56ynb6mmx7dc8hp9yhi7sfr0hhii0gs4ffq241"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index bf76ec74b0f..4ada201263f 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20191112"; + version = "20191113"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "059hkl172kk5gcsv87z02vh3vdayk63qa6m6yrsipi1203dmyvzw"; + sha256 = "04138j9n14197ybkh2vxfjy21wcgvbd183ya4b6k262y9nzjmvsa"; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 2d1e59668aa..789668cb89e 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -3,10 +3,10 @@ }: let dpdk_17_11 = dpdk.overrideAttrs (old: rec { - version = "17.11.6"; + version = "17.11.9"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "0g4l6yjcn17n18c7q1pxkmnj4fg2kiv0krz7n2vjjsb8s6gmbps2"; + sha256 = "0vrcc9mdjs5fk69lh7bigsk9208dfmjsz3jxaddkjlvk2hds1id6"; }; }); diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix index 8293ac0a830..012750c22ad 100644 --- a/pkgs/os-specific/linux/pam_ccreds/default.nix +++ b/pkgs/os-specific/linux/pam_ccreds/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pam, openssl, db}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "pam_ccreds-10"; src = fetchurl { - url = "http://www.padl.com/download/pam_ccreds.tgz"; + url = "https://www.padl.com/download/${name}.tar.gz"; sha256 = "1h7zyg1b1h69civyvrj95w22dg0y7lgw3hq4gqkdcg35w1y76fhz"; }; patchPhase = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ pam openssl db ]; meta = with stdenv.lib; { - homepage = http://www.padl.com/OSS/pam_ccreds.html; + homepage = https://www.padl.com/OSS/pam_ccreds.html; description = "PAM module to locally authenticate using an enterprise identity when the network is unavailable"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix index 5b34a8bc82b..2b3a300ecca 100644 --- a/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/pkgs/os-specific/linux/pam_ldap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pam_ldap-186"; src = fetchurl { - url = "http://www.padl.com/download/${name}.tar.gz"; + url = "https://www.padl.com/download/${name}.tar.gz"; sha256 = "0lv4f7hc02jrd2l3gqxd247qq62z11sp3fafn8lgb8ymb7aj5zn8"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam openldap ]; meta = { - homepage = http://www.padl.com/OSS/pam_ldap.html; + homepage = https://www.padl.com/OSS/pam_ldap.html; description = "LDAP backend for PAM"; longDescription = '' The pam_ldap module provides the means for Solaris and Linux servers and diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 2156177f641..5e355ac7c9a 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -32,7 +32,7 @@ mkDerivation { meta = with stdenv.lib; { description = "GUI for trace-cmd which is an interface for the Linux kernel ftrace subsystem"; - homepage = http://kernelshark.org/; + homepage = https://kernelshark.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ basvandijk ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 99425b6799c..dc5b4289a45 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://hostap.epitest.fi/wpa_supplicant/; + homepage = https://hostap.epitest.fi/wpa_supplicant/; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; license = licenses.bsd3; maintainers = with maintainers; [ marcweber ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 7c6f595bfaf..d02901e0cc1 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -25,7 +25,7 @@ mkDerivation { meta = with stdenv.lib; { description = "Qt-based GUI for wpa_supplicant"; - homepage = http://hostap.epitest.fi/wpa_supplicant/; + homepage = https://hostap.epitest.fi/wpa_supplicant/; license = licenses.bsd3; platforms = platforms.linux; }; |