From f661c4a7fcf804eab09b83661ff223b8806f993a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Jan 2018 13:51:20 -0600 Subject: [PATCH 01/13] guile: 2.2.0 -> 2.2.3 2.2.3: https://lists.gnu.org/archive/html/guile-devel/2017-12/msg00000.html 2.2.2: https://lists.gnu.org/archive/html/guile-devel/2017-04/msg00035.html 2.2.1: https://lists.gnu.org/archive/html/guile-devel/2017-04/msg00034.html --- pkgs/development/interpreters/guile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index fe9f94beed1..e10c5fbb568 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -10,11 +10,11 @@ (rec { name = "guile-${version}"; - version = "2.2.0"; + version = "2.2.3"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "05dmvhd1y135x7w5qfw4my42cfp6l8bbhjfxvchcc1cbdvzri0f1"; + sha256 = "11j01agvnci2cx32wwpqs9078856yxmvs15gcsz7ganpkj2ahlw3"; }; outputs = [ "out" "dev" "info" ]; From 25eeb15794a1a28ccaa73523d0b69531fee16481 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 15 Jan 2018 09:33:44 +0300 Subject: [PATCH 02/13] libnftnl: 1.0.8 -> 1.0.9 --- pkgs/development/libraries/libnftnl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 060f5ba4934..ad8c7626661 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnftnl-1.0.8"; + version = "1.0.9"; + name = "libnftnl-${version}"; src = fetchurl { - url = "http://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "0f10cfiyl4c0f8k3brxfrw28x7a6qvrakaslg4jgqncwxycxggg6"; + url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; + sha256 = "0d9nkdbdck8sg6msysqyv3m9kjr9sjif5amf26dfa0g3mqjdihgy"; }; nativeBuildInputs = [ pkgconfig ]; From 917429233b810d33a19a678c55e5d6625c6c4a15 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 16 Jan 2018 20:56:39 +0100 Subject: [PATCH 03/13] clang: patch cmake files for lib output Fixes cmake build issues introduced in #33342. --- pkgs/development/compilers/llvm/3.8/clang/default.nix | 2 ++ pkgs/development/compilers/llvm/3.9/clang/default.nix | 2 ++ pkgs/development/compilers/llvm/4/clang/default.nix | 2 ++ pkgs/development/compilers/llvm/5/clang/default.nix | 2 ++ 4 files changed, 8 insertions(+) diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 388c24e6336..fb7a5afb3dd 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -40,6 +40,8 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index f215aadc4d9..aafe30e4c9b 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -42,6 +42,8 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 404b65c56ab..223c4bd032f 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -61,6 +61,8 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index aaddd020a72..a387f49bd6b 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -62,6 +62,8 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin From f7c7dec43f4210f4d9175a315ff1a1ce6b53664d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 16 Jan 2018 22:19:02 +0100 Subject: [PATCH 04/13] firefox: use libclang --- pkgs/applications/networking/browsers/firefox/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index aeae471ce5b..3e90d54f39d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -132,7 +132,7 @@ stdenv.mkDerivation (rec { ] ++ lib.optionals (stdenv.lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ # on i686-linux: --with-libclang-path is not available in this configuration - "--with-libclang-path=${llvmPackages.clang-unwrapped}/lib" + "--with-libclang-path=${llvmPackages.libclang}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ] ++ lib.optionals (stdenv.lib.versionAtLeast version "57") [ From 47c5728e7d00ff22b6a47cf88bae49e77bea0a1d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 16 Jan 2018 22:20:13 +0100 Subject: [PATCH 05/13] mily: use libclang --- pkgs/applications/misc/milu/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index d8d1cff6040..09c4d1db290 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, pkgconfig, glib, clang, gcc }: +{ stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }: stdenv.mkDerivation rec { name = "milu-nightly-${version}"; @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's#/usr/bin/##g' Makefile - sed -i "s#-lclang#-L$(clang --print-search-dirs | - sed -ne '/libraries:/{s/libraries: =//; s/:/ -L/gp}') -lclang#g" Makefile ''; installPhase = '' @@ -28,8 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib unzip - clang - gcc + llvmPackages.libclang ]; meta = { From 64f730cf56d0acb2cb4cab1b5a14f2995f56c2d6 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 16 Jan 2018 22:55:36 +0100 Subject: [PATCH 06/13] ycmd: use libclang --- pkgs/development/tools/misc/ycmd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 4c60067c48e..5f90525feca 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -15,12 +15,13 @@ stdenv.mkDerivation rec { sha256 = "0bs94iv521ac2n53n3k8mw3s6v0hi3hhxhjsr0ips3n99al8wndi"; }; - buildInputs = [ cmake boost ] + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost llvmPackages.libclang ] ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames Cocoa ]; buildPhase = '' export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} - ${python.interpreter} build.py --clang-completer --system-boost + ${python.interpreter} build.py --system-libclang --clang-completer --system-boost ''; patches = [ ./dont-symlink-clang.patch ]; From 78f9d8074193eabe94464a19ab68ed81b4901071 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 16 Jan 2018 23:02:47 +0100 Subject: [PATCH 07/13] irony-server: use libclang --- pkgs/development/tools/irony-server/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index b52cbf21168..e2aa27a96eb 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -5,13 +5,14 @@ stdenv.mkDerivation rec { inherit (irony) version; nativeBuildInputs = [ cmake ]; + buildInputs = [ llvmPackages.libclang ]; dontUseCmakeBuildDir = true; cmakeDir = "server"; cmakeFlags = [ - ''-DCMAKE_PREFIX_PATH=${llvmPackages.clang.cc}'' + "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}" ]; src = irony.src; From b5fc6b7c10a3fb57dbaf90c1f5ec6340735c4164 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 16 Jan 2018 23:32:59 +0200 Subject: [PATCH 08/13] audit: 2.8.1 -> 2.8.2 --- pkgs/os-specific/linux/audit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 7bec6cadcfc..0558b42dda3 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -6,11 +6,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.8.1"; + name = "audit-2.8.2"; src = fetchurl { url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "0v1vng43fjsh158zb5k5d81ngn4p4jmj1247m27pk0bfzy9dxv0v"; + sha256 = "1fmw8whraz1q3y3z5mgdpgsa3wz6r3zq0kgsgbc9xvmgfwmrpdb7"; }; outputs = [ "bin" "dev" "out" "man" ]; From 10bcf978ebc4ca4b0a93b881736f29b07d789fe7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 16 Jan 2018 23:33:11 +0200 Subject: [PATCH 09/13] kmod: 24 -> 25 --- pkgs/os-specific/linux/kmod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index c55ebffa829..f9be8225570 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { name = "kmod-${version}"; - version = "24"; + version = "25"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; - sha256 = "15xkkkzvca9flvkm48gkh8y8f13vlm3sl7nz9ydc7b3jy4fqs2v1"; + sha256 = "1kgixs4m3jvwk7fb3d18n6j77qhgi9qfv4csj35rs5ancr4ycrbi"; }; nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; From b1c1190f361e9b9fe1b64d0716fdb6b839701a05 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 16 Jan 2018 23:35:01 +0200 Subject: [PATCH 10/13] utillinux: 2.31 -> 2.31.1 --- pkgs/os-specific/linux/util-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index f54f3ab311a..e8a2b342849 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -5,14 +5,14 @@ let version = lib.concatStringsSep "." ([ majorVersion ] ++ lib.optional (patchVersion != "") patchVersion); majorVersion = "2.31"; - patchVersion = ""; + patchVersion = "1"; in stdenv.mkDerivation rec { name = "util-linux-${version}"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; - sha256 = "12nw108xjhm63sh2n5a0qs33vpvbvb6rln96l9j50p7wykf7rgpr"; + sha256 = "04fzrnrr3pvqskvjn9f81y0knh0jvvqx4lmbz5pd4lfdm5pv2l8s"; }; patches = [ From b5be5ef364b031df7f51babd8c15e5bd0b6fa286 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Jan 2018 09:13:17 -0500 Subject: [PATCH 11/13] git: 2.15.1 -> 2.16.0 --- .../git-and-tools/git/default.nix | 4 +- .../git/git-send-email-honor-PATH.patch | 45 ++++++------------- .../git-and-tools/git/ssh-path.patch | 22 ++++----- 3 files changed, 26 insertions(+), 45 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 3a258543330..725f180bf8a 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.15.1"; + version = "2.16.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0p04linqdywdf7m1hqa904fzqvgzplsxlzdqrn96j1j5gpyr174r"; + sha256 = "1y1hdr8ydff5q7y762cwfdgaxam4mxvir6nrw3g51mmkcr77c40d"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch index 1aec77504b7..9a484262b7b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch @@ -1,47 +1,28 @@ -From 9a4396ddaedaf59ebee16d69900884e990b79cdd Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Fri, 17 Nov 2017 13:21:37 +0100 -Subject: [PATCH] git-send-email: honor $PATH - -This will search $PATH for a sendmail binary, instead of the (previously -fixed) list of paths. - -Signed-off-by: Florian Klink ---- - Documentation/git-send-email.txt | 5 ++--- - git-send-email.perl | 3 ++- - 2 files changed, 4 insertions(+), 4 deletions(-) - diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt -index bac9014ac..b9b1f2c41 100644 +index 8060ea35c..c81067a19 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt -@@ -203,9 +203,8 @@ a password is obtained using 'git-credential'. +@@ -203,8 +203,7 @@ a password is obtained using 'git-credential'. specify a full pathname of a sendmail-like program instead; the program must support the `-i` option. Default value can be specified by the `sendemail.smtpServer` configuration -- option; the built-in default is `/usr/sbin/sendmail` or -- `/usr/lib/sendmail` if such program is available, or -- `localhost` otherwise. -+ option; the built-in default is to search in $PATH if such program is -+ available, or `localhost` otherwise. - +- option; the built-in default is to search for `sendmail` in +- `/usr/sbin`, `/usr/lib` and $PATH if such program is ++ option; the built-in default is to search in $PATH if such program is + available, falling back to `localhost` otherwise. + --smtp-server-port=:: - Specifies a port different from the default port (SMTP diff --git a/git-send-email.perl b/git-send-email.perl -index 2208dcc21..8e357aeab 100755 +index edcc6d346..8e357aeab 100755 --- a/git-send-email.perl +++ b/git-send-email.perl -@@ -885,7 +885,8 @@ if (defined $initial_reply_to) { +@@ -885,8 +885,7 @@ if (defined $initial_reply_to) { } - + if (!defined $smtp_server) { -- foreach (qw( /usr/sbin/sendmail /usr/lib/sendmail )) { +- my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail ); +- push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH}; + my @sendmail_paths = map {"$_/sendmail"} split /:/, $ENV{PATH}; -+ foreach (@sendmail_paths) { + foreach (@sendmail_paths) { if (-x $_) { $smtp_server = $_; - last; --- -2.15.0 - diff --git a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch index 5e24c19f0fe..addb1dbc5e0 100644 --- a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch +++ b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch @@ -1,21 +1,21 @@ diff --git a/connect.c b/connect.c -index fd7ffe1..20cd992 100644 +index c3a014c5b..fbca3262b 100644 --- a/connect.c +++ b/connect.c -@@ -768,7 +768,7 @@ +@@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host, + + ssh = getenv("GIT_SSH"); + if (!ssh) +- ssh = "ssh"; ++ ssh = "@ssh@"; + variant = determine_ssh_variant(ssh, 0); + } - ssh = getenv("GIT_SSH"); - if (!ssh) -- ssh = "ssh"; -+ ssh = "@ssh@"; - else - handle_ssh_variant(ssh, 0, - &port_option, diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl -index 50029d0..17b9594 100644 +index 480a6b30d..781720424 100644 --- a/git-gui/lib/remote_add.tcl +++ b/git-gui/lib/remote_add.tcl -@@ -139,7 +139,7 @@ +@@ -139,7 +139,7 @@ method _add {} { # Parse the location if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path] || [regexp {([^:][^:]+):(.+)} $location xx host path]} { From 0db68e5d42c4426ccc2933e982836cba0bef0b48 Mon Sep 17 00:00:00 2001 From: corpix Date: Sat, 20 Jan 2018 08:29:03 +0000 Subject: [PATCH 12/13] apparmor: updating utilities to fresh python (#34049) * apparmor: updating utilities to fresh python * apparmor: better way to depend on python * apparmor: override python derivation on the top-level --- pkgs/os-specific/linux/apparmor/default.nix | 46 +++++++++++++++++---- pkgs/top-level/all-packages.nix | 5 ++- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index b026e91cc0b..29e1357d38a 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -2,14 +2,15 @@ , pkgconfig, which , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders -, pythonPackages +, python +, gawk , perl , swig +, ncurses , pam }: let - apparmor-series = "2.12"; apparmor-patchver = "0"; apparmor-version = apparmor-series + "." + apparmor-patchver; @@ -46,12 +47,13 @@ let flex pkgconfig swig + ncurses which ]; buildInputs = [ perl - pythonPackages.python + python ]; # required to build apparmor-parser @@ -61,7 +63,6 @@ let substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h" substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h" ''; - postPatch = "cd ./libraries/libapparmor"; configureFlags = "--with-python --with-perl"; @@ -83,7 +84,7 @@ let buildInputs = [ perl - pythonPackages.python + python libapparmor libapparmor.python ]; @@ -95,7 +96,7 @@ let postInstall = '' for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-status aa-unconfined ; do - wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${pythonPackages.python.libPrefix}/site-packages:$PYTHONPATH" + wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" done for prog in aa-notify ; do @@ -106,6 +107,29 @@ let meta = apparmor-meta "user-land utilities"; }; + apparmor-bin-utils = stdenv.mkDerivation { + name = "apparmor-bin-utils-${apparmor-version}"; + src = apparmor-sources; + + nativeBuildInputs = [ + pkgconfig + libapparmor + gawk + which + ]; + + buildInputs = [ + libapparmor + ]; + + prePatch = prePatchCommon; + postPatch = "cd ./binutils"; + makeFlags = ''LANGS= USE_SYSTEM=1''; + installFlags = ''DESTDIR=$(out) BINDIR=$(out)/bin''; + + meta = apparmor-meta "binary user-land utilities"; + }; + apparmor-parser = stdenv.mkDerivation { name = "apparmor-parser-${apparmor-version}"; src = apparmor-sources; @@ -172,6 +196,12 @@ let in { - inherit libapparmor apparmor-utils apparmor-parser apparmor-pam - apparmor-profiles apparmor-kernel-patches; + inherit + libapparmor + apparmor-utils + apparmor-bin-utils + apparmor-parser + apparmor-pam + apparmor-profiles + apparmor-kernel-patches; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a36547af80d..be045e1189c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12499,8 +12499,9 @@ with pkgs; microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { }; - inherit (callPackages ../os-specific/linux/apparmor { pythonPackages = python27Packages; swig = swig2; }) - libapparmor apparmor-pam apparmor-parser apparmor-profiles apparmor-utils; + inherit (callPackages ../os-specific/linux/apparmor { python = python3; }) + libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam + apparmor-profiles apparmor-kernel-patches; atop = callPackage ../os-specific/linux/atop { }; From 5fafb7ef739ccf36ba7914eb522471e91af4c431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 20 Jan 2018 09:48:35 +0100 Subject: [PATCH 13/13] clang-3.8: fixup build after #33953 917429233b --- pkgs/development/compilers/llvm/3.8/clang/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index fb7a5afb3dd..0147485dd58 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -40,7 +40,7 @@ let # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" - substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + substituteInPlace $out/share/clang/cmake/ClangTargets-release.cmake \ --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." mkdir -p $python/bin $python/share/clang/