diff options
Diffstat (limited to 'pkgs/os-specific')
66 files changed, 376 insertions, 347 deletions
diff --git a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix index cee03741dce6..3844912f6ba3 100644 --- a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix +++ b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix @@ -7,6 +7,10 @@ stdenv.mkDerivation rec { builder = writeScript "${name}-builder.sh" '' /bin/mkdir -p $out - /bin/ln -sv /usr/X11/{bin,lib,include,share} $out/ + /bin/mkdir $out/lib + /bin/ln -sv /usr/X11/lib/{*.dylib,X11,xorg} $out/lib + /bin/mkdir $out/lib/pkgconfig + /bin/ln -sv /usr/X11/lib/pkgconfig/{x*.pc,gl*.pc} $out/lib/pkgconfig + /bin/ln -sv /usr/X11/{bin,include,share} $out/ ''; } diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index d694a9e5ed24..2a774949530d 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "acpi-${version}"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz"; - sha256 = "0cawznhkzb51yxa599d1xkw05nklmjrrmd79vmjkkzf4002d4qgd"; + sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp"; }; meta = { diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index 7f3440d8f59e..c1f92476b879 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "acpid-2.0.17"; + name = "acpid-2.0.20"; src = fetchurl { - url = "http://tedfelix.com/linux/${name}.tar.xz"; - sha256 = "0gksl6z3sb6yyk7bdmldxsrncvprd3rny0i8ggl4m95nvv3x5drn"; + url = "mirror://sourceforge/acpid2/${name}.tar.xz"; + sha256 = "0l7pzjcpf1935bn44kzgc16h00clbx73cjm2dlyhzvvb5ksvl7ka"; }; preBuild = '' diff --git a/pkgs/os-specific/linux/alienfx/default.nix b/pkgs/os-specific/linux/alienfx/default.nix new file mode 100644 index 000000000000..9924779d92ab --- /dev/null +++ b/pkgs/os-specific/linux/alienfx/default.nix @@ -0,0 +1,38 @@ +{ stdenv, libusb1, fetchgit}: + + +let + rev = "85ee5eeaca59a1c92659c3f49b148b0447d78f16"; +in + +stdenv.mkDerivation { + name = "alienfx-1.0.0"; + src = fetchgit { + inherit rev; + url = https://github.com/tibz/alienfx.git; + + sha256 = "47501a3b4e08d39edee4cd829ae24259a7e740b9798db76b846fa872989f8fb1"; + }; + + patchPhase = '' + substituteInPlace Makefile --replace /usr/ $out/ + substituteInPlace Makefile --replace "install -o root -g root" "install" + ''; + + buildInputs = [ libusb1 ]; + makeFlags = "build"; + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/man/man1 + ''; + installTargets = "install"; + postInstall = ''cp alienfx.1 $out/man/man1''; + + meta = { + description = "Controls AlienFX lighting"; + homepage = "https://github.com/tibz/alienfx"; + maintainers = [stdenv.lib.maintainers.tomberek]; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 26d32594fba2..239c70d515d5 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "alsa-lib-1.0.26"; + name = "alsa-lib-1.0.27.2"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2" "http://alsa.cybermirror.org/lib/${name}.tar.bz2" ]; - sha256 = "0zbfkwqn7ixa71lsna9llq6i2gic540h8r8r0rjdphrwc1hq37wc"; + sha256 = "068d8c92122hwca5jzhrjp4a131995adlb1d79zgrm7gwy9x63k9"; }; configureFlags = "--disable-xmlto"; diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index fb17b47b5060..5b822969968c 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }: stdenv.mkDerivation rec { - name = "alsa-plugins-1.0.26"; + name = "alsa-plugins-1.0.27"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2" "http://alsa.cybermirror.org/plugins/${name}.tar.bz2" ]; - sha256 = "07wz3kl6isabk15ddpzz820pqlgvw6q0m7knnbgv9780s8s52l83"; + sha256 = "0ddbycq4cn9mc8xin0vh1af0zywz2rc2xyrs6qbayyyxq8vhrg8b"; }; buildInputs = diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index c121b227eee9..3eafe8bbfe5b 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { - name = "alsa-utils-1.0.26"; + name = "alsa-utils-1.0.27"; src = fetchurl { # url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"; url = "http://alsa.cybermirror.org/utils/${name}.tar.bz2"; - sha256 = "1rw1n3w8syqky9i7kwy5xd2rzfdbihxas32vwfxpb177lqx2lpzq"; + sha256 = "1vssljbdzf0psqhhd7w9m9mzb0sl2kgx9fagkja25sqw6ivwsxkg"; }; buildInputs = [ alsaLib ncurses libsamplerate ]; diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 326de9ed81ae..ab95accd7493 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -68,7 +68,8 @@ stdenv.mkDerivation rec { homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; license = "unfree"; maintainers = [stdenv.lib.maintainers.marcweber]; - #platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; + hydraPlatforms = []; }; # moved assertions here because the name is evaluated when the NixOS manual is generated diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix new file mode 100644 index 000000000000..a7ff782d69ed --- /dev/null +++ b/pkgs/os-specific/linux/audit/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, openldap +, enablePython ? false, python ? null +}: + +assert enablePython -> python != null; + +stdenv.mkDerivation rec { + name = "audit-2.3.2"; + + src = fetchurl { + url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; + sha256 = "0a8x10wz0xfj0iq1wgjl6hdhxvq58cb3906vc687i21876sy0wl8"; + }; + + buildInputs = [ openldap ] + ++ stdenv.lib.optional enablePython python; + + configureFlags = '' + ${if enablePython then "--with-python" else "--without-python"} + ''; + + meta = { + description = "Audit Library"; + homepage = "http://people.redhat.com/sgrubb/audit/"; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/autofs/autofs-v5.nix b/pkgs/os-specific/linux/autofs/autofs-v5.nix index 731b383e7117..81ead8d33d0e 100644 --- a/pkgs/os-specific/linux/autofs/autofs-v5.nix +++ b/pkgs/os-specific/linux/autofs/autofs-v5.nix @@ -4,17 +4,17 @@ let baseURL = mirror://kernel/linux/daemons/autofs/v5; in stdenv.mkDerivation { - name = "autofs-5.0.5"; + name = "autofs-5.0.8"; src = fetchurl { - url = "${baseURL}/autofs-5.0.5.tar.bz2"; - sha256 = "00k0k3jkbr29gn1wnzqjyc9iqq5bwjyip1isc79wf51wph0kxiv8"; + url = "${baseURL}/autofs-5.0.8.tar.bz2"; + sha256 = "0zczihrqdamj43401v2pczf7zi94f8qk20gc6l92nxmpak3443if"; }; patches = import ./patches-v5.nix fetchurl; preConfigure = '' - configureFlags="--with-path=$PATH" + configureFlags="--disable-move-mount --with-path=$PATH" export MOUNT=/var/run/current-system/sw/bin/mount export UMOUNT=/var/run/current-system/sw/bin/umount export MODPROBE=/var/run/current-system/sw/sbin/modprobe diff --git a/pkgs/os-specific/linux/autofs/create-patches-v5.sh b/pkgs/os-specific/linux/autofs/create-patches-v5.sh index 781c59a324a9..1fe6b503288d 100644 --- a/pkgs/os-specific/linux/autofs/create-patches-v5.sh +++ b/pkgs/os-specific/linux/autofs/create-patches-v5.sh @@ -1,10 +1,10 @@ #!/bin/sh # # Use this script with the upstream sorted list of patches -# curl ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/patch_order-5.0.5 | +# curl ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/patches-5.0.{x+1}/patch_order-5.0.x | # grep -v '^#' | sh create-patches-v5.sh -BASEURL=mirror://kernel/linux/daemons/autofs/v5; +BASEURL=mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9; echo '# File created automatically' > patches-v5.nix echo 'fetchurl :' >> patches-v5.nix diff --git a/pkgs/os-specific/linux/autofs/patches-v5.nix b/pkgs/os-specific/linux/autofs/patches-v5.nix index 0598102fb2ac..a577beefbe7f 100644 --- a/pkgs/os-specific/linux/autofs/patches-v5.nix +++ b/pkgs/os-specific/linux/autofs/patches-v5.nix @@ -1,32 +1,7 @@ # File created automatically fetchurl : [ -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-included-map-read-fail-handling.patch; sha256 = "1a8yhy898zp8hn6ihnz8scannjx74am6ys6dkahds4ga3zjg0k27"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-refactor-ldap-sasl-bind.patch; sha256 = "0c4izyvg4mrn0h4g18vk7d10zyb6b1sh40bjrm0xc6ga7n7z89x1"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.4-add-mount-wait-parameter.patch; sha256 = "1a8wd8lyx4bh9v6yw0360vbzjwvr1w838k2g3xrg374z6fmj4n3f"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-special-case-cifs-escapes.patch; sha256 = "0cb4kaipdmqlx11nw1l9c6ccssl01q5zg3f9zaarhv6ha91jag63"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-libxml2-workaround-configure.patch; sha256 = "1fb5ksyqc7706j48hwjarsk83047np360kln6lll8plmrg2539rc"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-more-code-analysis-corrections.patch; sha256 = "1lhx6iblmi4b8jx5sd94jlj8pwkhfy9f7dxnx45af0c251rcqxi9"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-backwards-ifndef-INET6.patch; sha256 = "0k2cbr2651w6hf720qm68l66d3jr5y6yp80igr7ym60q68pxkwfk"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-stale-init-for-file-map-instance.patch; sha256 = "1h128fj8bgwg8ym0066dl9qp5yfv8jrjnrhsdsmfx2qdq2shyj42"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-ext4-fsck-at-mount.patch; sha256 = "1w92iykwnpvz6sbn98nmc9qa8wwar2qidqln3f14wfic9jrs2x6n"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-dont-use-master_lex_destroy-to-clear-parse-buffer.patch; sha256 = "1rq2xqj3jqibbknnssd3ji0ymdw8jq7fv2a4s15m63rd8q3b2mci"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-make-documentation-for-set-log-priority-clearer.patch; sha256 = "0ly5zkhsx49b98vzrq863ksj9f8024vrzivlhwa45p47kzza9p9b"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-timeout-in-connect_nb.patch; sha256 = "1fhy7rmvk14ikxnavlznx8qya0y5gm73y8gs1v1piwmig0g3y8hf"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-pidof-init-script-usage.patch; sha256 = "1rqpdjn99wqr8j591qsn231chwi3s25jma3raqmpsip3vz75rfy8"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-check-for-path-mount-location-in-generic-module.patch; sha256 = "17lccz000ajclm29v7cv6i2dxs7lgb0p6dg9xdp84h58h6x94n0l"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-dont-fail-mount-on-access-fail.patch; sha256 = "0sssai921nkin77gi6n62qsxp97f49xa7cwb51dwy8216qcn5fkr"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-rpc-large-export-list.patch; sha256 = "1k4574pkmnp55jkqg83f3pyw3vqf0pv8fyhwb6ndrzfmgrmbcqar"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-memory-leak-on-reload.patch; sha256 = "15qc61akl0gvs33anz6vif2cb4g1v47s9n6v9j0sdw4sw45292gv"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-update-kernel-patches-2.6.18-and-2.6.19.patch; sha256 = "0rlb3k2bq5f18jrwa7xnfq3rxngqv9i07xcpyfq8yv3lj6qrb5qc"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-dont-connect-at-ldap-lookup-module-init.patch; sha256 = "0dvfvim2riasa3dcf4ifkjg9bssaq8am4asrxfl9gkxqa3lp0drh"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-random-selection-option.patch; sha256 = "0ignn2m4syk491awkrzjj07vyfmlj4fyigk8fd3larn06vpcy0kx"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-disable-timeout.patch; sha256 = "0d66pm2kmc9pz6k0shsd1gx0m8jhf71ik6wa7nzdijwpzzmbdagc"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-strdup-return-value-check.patch; sha256 = "0k0xqs1k12nxiaidf3j2w8iywycpbx14bmxc00ra0nc2i3shd6cz"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-reconnect-get-base-dn.patch; sha256 = "1yn5fcb1xqzycmnbv6l7ghjy34vlacbnr5yz37sfgz7w81qr7xgk"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-add-sasl-mutex-callbacks.patch; sha256 = "18kkznkg2p5f0gq4hncis37j75pg72h7la9q71xpl0ci875j35r8"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-get-qdn-fail.patch; sha256 = "0sd6k7fcwvql1p3vhhfjiw4rbrqyr36fvjv37dyap7p6sahn84n9"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-fix-ampersand-escape-in-auto-smb.patch; sha256 = "1imsxa4rdbkdy8lx7sibm6g91f05lidhfzwf2k4fbkiz9232872r"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute.patch; sha256 = "1r3azgm8y5i42p9hmp4mn88wz0ks6fyrjb80nj3npv6x3qy8cryv"; }) -(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute-fix.patch; sha256 = "026gbbffadl4ly5n5z73mzf2ga14m9ya09agbxrpsf24f4h65cw4"; }) +(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9/autofs-5.0.8-fix-undefined-authtype_requires_creds-err-if-ldap-en.patch; sha256 = "11v1a32rx57ylp8scswpk41jl9n4kfx55nvdlzhvfs4rhws18rpx"; }) +(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9/autofs-5.0.8-fix-master-map-type-check.patch; sha256 = "1nkq0y6j7dc6214af3q9bxvy7pv9kak0q9chijxcj6zkhfzwrjy3"; }) +(fetchurl { url = mirror://kernel/linux/daemons/autofs/v5/patches-5.0.9/autofs-5.0.8-fix-task-manager-not-getting-signaled.patch; sha256 = "17h06wk4x0rqiky6pm9dglbc5ycxxrd3438a9snnlysl4zzgrqhx"; }) ] diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 6bc0759c1a2b..3f5d85e8f6ff 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; pythonPath = with pythonPackages; - [ pythonDBus pygobject3 recursivePthLoader ]; + [ pythonDBus pygobject pygobject3 recursivePthLoader ]; buildInputs = [ pkgconfig dbus.libs glib libusb alsaLib python pythonPackages.wrapPython diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index a24e0fd2307b..fd1e83100ed5 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -37,16 +37,13 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.20.2"; + name = "busybox-1.21.1"; src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "10k8kgrprll9hxfm9gc3jl7kkq79g6l2pygn5snqwqg5v80zy4zb"; + sha256 = "00qk938q90jv14mxmadm8pgs3jymkknc6xicw4512mn85s8y0nyd"; }; - # Remove this patch after the next busybox update. - patches = [ ./include-missing-sys-resource-header.patch ]; - configurePhase = '' make defconfig ${configParser} diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index 9125c84bd7a1..a718b3656c44 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "checkpolicy-${version}"; - version = "2.1.11"; + version = "2.2"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz"; - sha256 = "1wahs32l4jjlg0s3lyihdhvwmsy7yyvq5pk96q9lsiilc5vvrb06"; + sha256 = "1y5dx4s5k404fgpm7hlhgw8a9b9ksn3q2d3fj6f9rdac9n7nkxlz"; }; buildInputs = [ libsepol libselinux bison flex ]; diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 0f8801ef58eb..bef8de495ad3 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cifs-utils-5.6"; + name = "cifs-utils-6.2"; src = fetchurl { url = "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; - sha256 = "0f619nw1163bcmfc83mmqj31qdkl68wfm81vynx3d8q0m0k1ll7i"; + sha256 = "0cydya7l7xwxk2j1g1659kbvb4jzql11ivb6cldwwfg19qvnwrrl"; }; - patches = [ ./find-systemd-ask-password-via-path.patch ]; - makeFlags = "root_sbindir=$(out)/sbin"; meta = { diff --git a/pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch b/pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch deleted file mode 100644 index 428cb75edadf..000000000000 --- a/pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ubr cifs-utils-5.9-orig/mount.cifs.c cifs-utils-5.9/mount.cifs.c ---- cifs-utils-5.9-orig/mount.cifs.c 2013-03-05 10:53:19.375464790 +0100 -+++ cifs-utils-5.9/mount.cifs.c 2013-03-05 11:41:40.704946110 +0100 -@@ -1634,7 +1634,7 @@ - } - - /* -- * If systemd is running and /bin/systemd-ask-password -- -+ * If systemd is running and systemd-ask-password -- - * is available, then use that else fallback on getpass(..) - * - * Returns: @input or NULL on error -@@ -1657,7 +1657,7 @@ - FILE *ask_pass_fp = NULL; - - cmd = ret = NULL; -- if (asprintf(&cmd, "/bin/systemd-ask-password \"%s\"", prompt) >= 0) { -+ if (asprintf(&cmd, "/run/current-system/sw/bin/systemd-ask-password \"%s\"", prompt) >= 0) { - ask_pass_fp = popen (cmd, "re"); - free (cmd); - } -Only in cifs-utils-5.9/: mount.cifs.c.orig diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix index 537cc386402b..f8be37edfe2e 100644 --- a/pkgs/os-specific/linux/consoletools/default.nix +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit, SDL }: +{ stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { name = "linuxconsoletools-${version}"; - version = "1.4.3"; + version = "1.4.6"; - src = fetchgit { - url = "git://linuxconsole.git.sourceforge.net/gitroot/linuxconsole/linuxconsole"; - rev = "dac2cae0e5795ddc27b76a92767dd9e07a10621e"; - sha256 = "350b008e614923dbd548fcaaf2842b39433acdcf595e2ce8aaf1599f076d331d"; + src = fetchurl { + url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2"; + sha256 = "0035yhjbjdis5wqmbdz67xq61065x7vrx5mb7kb1rhrx3ag43wcf"; }; buildInputs = [ SDL ]; diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 85907ff0212a..c94e22adb381 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -2,12 +2,12 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "cpufrequtils-008"; src = fetchurl { - url = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz; - md5 = "52d3e09e47ffef634833f7fab168eccf"; + url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/${name}.tar.gz"; + sha256 = "127i38d4w1hv2dzdy756gmbhq25q3k34nqb2s0xlhsfhhdqs0lq0"; }; patchPhase = '' diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index e80256f7299f..7a818530ca2d 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, kernelDev, onlyHeaders ? false }: stdenv.mkDerivation rec { - pname = "cryptodev-linux-1.5"; + pname = "cryptodev-linux-1.6"; name = "${pname}-${kernelDev.version}"; src = fetchurl { url = "http://download.gna.org/cryptodev-linux/${pname}.tar.gz"; - sha256 = "13hybl5p0ck0vgi2gxmiwa2810gcfk78kdy17ai8nczj8il15mn0"; + sha256 = "0bryzdb4xz3fp2q00a0mlqkj629md825lnlh4gjwmy51irf45wbm"; }; buildPhase = if !onlyHeaders then '' diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 0eb4be302841..93f62ab7e0a9 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -5,11 +5,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "cryptsetup-1.5.1"; + name = "cryptsetup-1.6.2"; src = fetchurl { url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2"; - sha256 = "0dib3nw6ifd7d7hr9k4iyaha3hz0pkzairqa38l3fndkr9w3zlhn"; + sha256 = "16hh7v8bsqy0i1wlaj03kwqjv3liffkvg06lk75lng9hk00kywhm"; }; configureFlags = [ "--enable-cryptsetup-reencrypt" ] diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index e6b5035bd8ed..40564f9f95a7 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dmidecode-2.11"; + name = "dmidecode-2.12"; src = fetchurl { url = "mirror://savannah/dmidecode/${name}.tar.bz2"; - sha256 = "0l9v8985piykc98hmbg1cq5r4xwvp0jjl4li3avr3ddkg4s699bd"; + sha256 = "122hgaw8mpqdfra159lfl6pyk3837giqx6vq42j64fjnbl2z6gwi"; }; makeFlags = "prefix=$(out)"; diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 7129b685eb90..068e49d01905 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "drbd-8.4.0"; + name = "drbd-8.4.4"; src = fetchurl { url = "http://oss.linbit.com/drbd/8.4/${name}.tar.gz"; - sha256 = "096njwxjpwvnl259gxq6cr6n0r6ba0h5aryvgk05hqi95jx927vg"; + sha256 = "0hm1cnd7vsccyc22sg85f9aj48nijl2f1kgbvl5crv414ihv5giq"; }; patches = [ ./pass-force.patch ]; diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index bd2507ec1bc1..183d2d86d4c6 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, utillinux }: stdenv.mkDerivation rec { - name = "fuse-2.9.2"; + name = "fuse-2.9.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://sourceforge/fuse/${name}.tar.gz"; - sha256 = "1z6fg593hy1j7mynhckx43gqkkg2nwpmwwv860337nl77zxji9w1"; + sha256 = "071r6xjgssy8vwdn6m28qq1bqxsd2bphcd2mzhq0grf5ybm87sqb"; }; configureFlags = "--disable-kernel-module"; diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index b627d664aef1..bc83738acc8e 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hdparm-9.39"; + name = "hdparm-9.43"; src = fetchurl { url = "mirror://sourceforge/hdparm/${name}.tar.gz"; - sha256 = "1siw9c2hrsck47jr9wpip9n677g31qd34y8whkq9dai68npm1mbj"; + sha256 = "0amm2s67vzfgs0jv59jgj9pqkr6j9glj1chsj292263i94kr5gib"; }; preBuild = '' diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index 91dc90681032..d0e77a3bb700 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gawk }: -let version = "1.98.1"; +let version = "2.0"; in stdenv.mkDerivation rec { name = "hibernate-${version}"; src = fetchurl { - url = "http://www.tuxonice.net/downloads/all/hibernate-script-${version}.tar.gz"; - sha256 = "1xpc2i16jczc3nhvxlkn6fb044srqrh528gnp92cwy4hxf2nzi1z"; + url = "http://tuxonice.nigelcunningham.com.au/files/hibernate-script-${version}.tar.gz"; + sha256 = "0ib5bac3spbcwmhf8f9apjbll8x7fgqj4k1s5q3srijh793rfifh"; }; patches = [ ./install.patch ./gen-manpages.patch ./hibernate.patch ]; diff --git a/pkgs/os-specific/linux/hwdata/builder.sh b/pkgs/os-specific/linux/hwdata/builder.sh deleted file mode 100644 index 50d114773240..000000000000 --- a/pkgs/os-specific/linux/hwdata/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -export DESTDIR=$out - -genericBuild diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 4c0a46f460cb..e701c91019df 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -1,10 +1,21 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "hwdata-0.172"; - builder = ./builder.sh; + name = "hwdata-0.249"; + src = fetchurl { - url = ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/pool/main/h/hwdata/hwdata_0.172.orig.tar.gz; - md5 = "1c6b7f4dfe489f881702176c5f8e5a2e"; + url = "https://git.fedorahosted.org/cgit/hwdata.git/snapshot/hwdata-0.249-1.tar.bz2"; + sha256 = "1ak3h3psg3wk9yk0dqnzdzik3jadzja3ah22vjfmf71p3b5xc8ai"; + }; + + preConfigure = "patchShebangs ./configure"; + + configureFlags = "--datadir=$(prefix)/data"; + + meta = { + homepage = "https://fedorahosted.org/hwdata/"; + description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 4ea4152e30d4..9e8faa6a02e3 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }: stdenv.mkDerivation rec { - name = "iproute2-3.8.0"; + name = "iproute2-3.12.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0kqy30wz2krbg4y7750hjq5218hgy2vj9pm5qzkn1bqskxs4b4ap"; + sha256 = "04gi11gh087bg2nlxhj0lxrk8l9qxkpr88nsiil23917bm3h1xj4"; }; - patches = [ ./vpnc.patch ./no-werror.patch ]; + patch = [ "vpnc.patch" ]; preConfigure = '' @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { sed -e '/ARPDDIR/d' -i Makefile ''; - postConfigure = "cat Config"; - makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin" + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}" + " MANDIR=$(out)/share/man"; diff --git a/pkgs/os-specific/linux/iproute/no-werror.patch b/pkgs/os-specific/linux/iproute/no-werror.patch deleted file mode 100644 index 593b56b8de09..000000000000 --- a/pkgs/os-specific/linux/iproute/no-werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ubr iproute2-3.8.0-orig/Makefile iproute2-3.8.0/Makefile ---- iproute2-3.8.0-orig/Makefile 2013-04-06 00:03:21.072827860 +0200 -+++ iproute2-3.8.0/Makefile 2013-04-06 00:03:25.353837862 +0200 -@@ -30,7 +30,7 @@ - HOSTCC = gcc - DEFINES += -D_GNU_SOURCE - CCOPTS = -O2 --WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes -+WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes - WFLAGS += -Wmissing-declarations -Wold-style-definition - - CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 78d8ee52fb18..0e022e0c4a11 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,24 +1,17 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "iptables-1.4.16.2"; + name = "iptables-1.4.21"; src = fetchurl { url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; - md5 = "57220bb26866a713073e5614f88071fc"; + sha256 = "1q6kg7sf0pgpq0qhab6sywl23cngxxfzc9zdzscsba8x09l4q02j"; }; - # Install header files required by miniupnpd. - postInstall = - '' - cp include/iptables.h $out/include - cp include/libiptc/libiptc.h include/libiptc/ipt_kernel_headers.h $out/include/libiptc - mkdir $out/include/iptables - cp include/iptables/internal.h $out/include/iptables - mkdir $out/include/net - cp -prd include/net/netfilter $out/include/net/netfilter - mkdir $out/include/linux - ''; + configureFlags = '' + --enable-devel + --enable-shared + ''; meta = { description = "A program to configure the Linux IP packet filtering ruleset"; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index ac8d4824c62d..2609e1880b42 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libnl, pkgconfig}: stdenv.mkDerivation rec { - name = "iw-3.10"; + name = "iw-3.11"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz"; - sha256 = "1sagsrl2s0d3ar3q2yc5qxk2d47zgn551akwcs9f4a5prw9f4vj5"; + sha256 = "1zrh0pjcy0kg6n8wlr34cg3bmi3nj28rhqn5pad23a1170r2f0z9"; }; buildInputs = [ libnl pkgconfig ]; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 1ade24736279..3e1fc920a59b 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -40,9 +40,6 @@ , ... }: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - || stdenv.isArm || stdenv.system == "mips64el-linux"; - assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null; let diff --git a/pkgs/os-specific/linux/kernel/grsec-path.patch b/pkgs/os-specific/linux/kernel/grsec-path.patch new file mode 100644 index 000000000000..be242779548f --- /dev/null +++ b/pkgs/os-specific/linux/kernel/grsec-path.patch @@ -0,0 +1,15 @@ +diff --git a/kernel/kmod.c b/kernel/kmod.c +index 3227c2c..f32c944 100644 +--- a/kernel/kmod.c ++++ b/kernel/kmod.c +@@ -246,8 +246,8 @@ static int ____call_usermodehelper(void *data) + out the path to be used prior to this point and are now operating + on that copy + */ +- if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) && +- strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7)) || strstr(sub_info->path, "..")) { ++ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/nix/store/", 11) && ++ strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || strstr(sub_info->path, "..")) { + printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path); + retval = -EPERM; + goto fail; diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix deleted file mode 100644 index 30b70035dfac..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.0.99"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1p31gq9kzwfks980y6rb2mjyagj8lrh6y156a550v7mk0bd4fzdi"; - }; - - features.iwlwifi = true; -}) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 65660619857b..84d3f64cf2c0 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.15"; + version = "3.10.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "07wjh58sylbbw9hwxd5xvbz3dxd05iar8ahzk90lki38m5157ffk"; + sha256 = "0nkiy2hxwam91707vccprmap28wiwxar2v2ishj1bb2xzkbnxwpd"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.11.nix b/pkgs/os-specific/linux/kernel/linux-3.11.nix index 6531895d8a7b..5167a4263101 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.11.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.11.6"; + version = "3.11.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0klbyx6qy3ifwrwh5w7yzk6m6jd32flkk73z95bih3ihmbnbzlvs"; + sha256 = "0g2c7zzgsrwg6y6j8rn3sn7nx464857i7w0575b1lz24493cgdna"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index f0929af1d292..4b1709b310c0 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12-rc3"; + version = "3.12.2"; src = fetchurl { - url = "https://www.kernel.org/pub/linux/kernel/v3.0/testing/linux-${version}.tar.xz"; - sha256 = "1rayb0f4n81yp9ghcws0v36dpqyl9ks3naf37p2qy7jvrwagmj28"; + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "19kjhvg65z6l21srghjmlfyrwr0pswbkb02nd095v45lkyi3kwyk"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 47393b0ae744..e7405c522a62 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.67"; + version = "3.4.71"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1ndzlwhxvlm4lr86240h3ysxhmdkgdcp0n6qhid5nwrmxf5fpb1d"; + sha256 = "0l9bv40mwk45ccmb2pfy574h6zrclrz5vhvmnn61q3z16j269dpp"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix deleted file mode 100644 index 51bcf35b3fe8..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.9.11"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0d5j7kg1ifzwipicbi4g26plzbzn1rlvgj1hs4zip6sxj8ifbffl"; - }; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -}) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix index fdf2f139c331..6d28c376078d 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix @@ -15,5 +15,5 @@ in import ./generic.nix (args // rec { features.iwlwifi = true; - extraMeta.platforms = []; + extraMeta.hydraPlatforms = []; }) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 29eb170287ad..f097f2562d02 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,8 +1,8 @@ { stdenv, runCommand, nettools, bc, perl, kmod, writeTextFile }: -with stdenv.lib; - let + inherit (stdenv.lib) + hasAttr getAttr optionalAttrs optional optionalString maintainers platforms; # Function to parse the config file into a nix expression readConfig = configFile: @@ -169,6 +169,6 @@ stdenv.mkDerivation { maintainers = [ maintainers.shlevy ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 613f40c6fc96..128c42533c63 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -3,7 +3,7 @@ let makeTuxonicePatch = { version, kernelVersion, sha256, - url ? "http://tuxonice.net/files/tuxonice-${version}-for-${kernelVersion}.patch.bz2" }: + url ? "http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-${kernelVersion}-${version}.patch.bz2" }: { name = "tuxonice-${kernelVersion}"; patch = stdenv.mkDerivation { name = "tuxonice-${version}-for-${kernelVersion}.patch"; @@ -68,20 +68,6 @@ rec { features.secPermPatch = true; }; - aufs3_0 = rec { - name = "aufs3.0"; - version = "3.0.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "0627c706d69778f5c74be982f28c746153b8cdf7"; - sha256 = "7008ff64f5adc2b3a30fcbb090bcbfaac61b778af38493b6144fc7d768a6514d"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - aufs3_2 = rec { name = "aufs3.2"; version = "3.2.20121210"; @@ -131,14 +117,37 @@ rec { patch = ./mips-ext3-n32.patch; }; - grsecurity_2_9_1_3_2_52 = - { name = "grsecurity-2.9.1-3.2.52"; + tuxonice_3_10 = makeTuxonicePatch { + version = "2013-11-07"; + kernelVersion = "3.10.18"; + sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j"; + }; + + + grsecurity_3_0_3_2_52 = + { name = "grsecurity-3.0-3.2.52"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.52-201310271550.patch; - sha256 = "08y4y323y2lfvdj67gmg3ca8gaf3snhr3pyrmgvj877avaz0475m"; + url = https://grsecurity.net/stable/grsecurity-3.0-3.2.52-201311261307.patch; + sha256 = "1zmzgjpbq90q2w3yl3dgdc79qan7qkh5w6g3y3nvzr6ww6jl8hqw"; }; - # The grsec kernel patch seems to include the apparmor patches as of 2.9.1-3.2.52 + features.grsecurity = true; + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.52 features.apparmor = true; }; + grsecurity_3_0_3_12_1 = + { name = "grsecurity-3.0-3.12.1"; + patch = fetchurl { + url = https://grsecurity.net/test/grsecurity-3.0-3.12.1-201311261309.patch; + sha256 = "129q740m2iivc4i9a465lvzcph9gxlivxzg2p9dsi7c136p42mdz"; + }; + features.grsecurity = true; + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.1 + features.apparmor = true; + }; + + grsec_path = + { name = "grsec-path"; + patch = ./grsec-path.patch; + }; } diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 43c580c2528f..8673981ecd50 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -1,18 +1,22 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, gnumake, file }: stdenv.mkDerivation rec { - name = "keyutils-1.2"; + name = "keyutils-1.5.8"; src = fetchurl { - url = http://people.redhat.com/dhowells/keyutils/keyutils-1.2.tar.bz2; - sha256 = "0gcv47crbaw6crgn02j1w75mknhnwgkhmfcmwq2qi9iwiwprnv9h"; + url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; + sha256 = "17419fr7mph8wlhxpqb1bdrghz0db15bmjdgxg1anfgbf9ra6zbc"; }; + buildInputs = [ file ]; + patchPhase = '' - sed -i -e "s, /etc, $out/etc," \ + sed -i -e "s,/usr/bin/make,${gnumake}/bin/make," \ + -e "s, /etc, $out/etc," \ -e "s, /bin, $out/bin," \ -e "s, /sbin, $out/sbin," \ -e "s, /lib, $out/lib," \ + -e "s, /lib64, $out/lib64," \ -e "s,/usr,$out," \ Makefile ''; diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 96d756bc7d2a..acea2e4435cc 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }: stdenv.mkDerivation rec { - name = "kmod-12"; + name = "kmod-15"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; - sha256 = "c6189dd8c5a1e8d9224e8506bd188c0cd5dfa119fd6b7e5869b3640cbe8bf92f"; + sha256 = "17nasn7kpbmbcgyfn9lh50k00bg6qmccxrhzd2m4d6wjw6khxvz8"; }; # Disable xz/zlib support to prevent needing them in the initrd. diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix new file mode 100644 index 000000000000..df98b5260c6b --- /dev/null +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit, udev, utillinux, mountPath ? "/media/" }: + +assert mountPath != ""; + +let + name = "ldm-0.4.2"; +in +stdenv.mkDerivation { + inherit name; + + # There is a stable release, but we'll use the lvm branch, which + # contains important fixes for LVM setups. + src = fetchgit { + url = "https://github.com/LemonBoy/ldm.git"; + rev = "26633ce07b"; + sha256 = "bb733d3b9b3bd5843b9cf1507a04a063c5aa45b398480411709fc727ae10b8b1"; + }; + + buildInputs = [ udev utillinux ]; + + preBuild = '' + substituteInPlace ldm.c \ + --replace "/mnt/" "${mountPath}" + ''; + + installPhase = '' + mkdir -p $out/bin + cp -v ldm $out/bin + ''; + + meta = { + description = "A lightweight device mounter, with libudev as only dependency"; + license = "MIT"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.the-kenny ]; + }; +} diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index 86dffde4b557..7fe0a2be10f5 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "libatasmart-0.17"; + name = "libatasmart-0.19"; src = fetchurl { - url = "http://0pointer.de/public/${name}.tar.gz"; - sha256 = "1zazxnqsirlv9gkzij6z31b21gv2nv7gkpja0wpxwb7kfh9a2qid"; + url = "http://0pointer.de/public/${name}.tar.xz"; + sha256 = "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"; }; buildInputs = [ pkgconfig udev ]; diff --git a/pkgs/os-specific/linux/libnl/3.2.19.nix b/pkgs/os-specific/linux/libnl/3.2.19.nix new file mode 100644 index 000000000000..ea508c088e76 --- /dev/null +++ b/pkgs/os-specific/linux/libnl/3.2.19.nix @@ -0,0 +1,20 @@ + +{stdenv, fetchurl, bison, flex}: + +stdenv.mkDerivation rec { + name = "libnl-3.2.19"; + + src = fetchurl { + url = "${meta.homepage}files/${name}.tar.gz"; + sha256 = "12q97cw680hg4rylyd8j3d7azwwia4ndsv3kybd1ajp8hjni39ip"; + }; + + buildInputs = [ bison flex ]; + + meta = { + homepage = "http://www.infradead.org/~tgr/libnl/"; + description = "Linux NetLink interface library"; + maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 6fe31c631788..093a00ed9a5c 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, bison, flex}: stdenv.mkDerivation rec { - name = "libnl-3.2.13"; + name = "libnl-3.2.23"; src = fetchurl { url = "${meta.homepage}files/${name}.tar.gz"; - sha256 = "1ydw42lsd572qwrfgws97n76hyvjdpanwrxm03lysnhfxkna1ssd"; + sha256 = "1czj2bpb799bih6ighqwbvv9pvbpcw7vmccv9cwavfwcmalwvhlc"; }; buildInputs = [ bison flex ]; diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 01935e766324..2dd5bdfb24ce 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libselinux-${version}"; - version = "2.1.12"; + version = "2.2.1"; inherit (libsepol) se_release se_url; src = fetchurl { @@ -16,30 +16,22 @@ stdenv.mkDerivation rec { sha256 = "17navgvljgq35bljzcdwjdj3khajc27s15binr51xkp0h29qgbcd"; }; - patch_src = fetchurl { - url = "http://dev.gentoo.org/~swift/patches/libselinux/patchbundle-${name}-r2.tar.gz"; - sha256 = "08zaas8iwyf4w9ll1ylyv4gril1nfarckd5h1l53563sxzyf7dqh"; - }; - - patches = [ ./fPIC.patch ]; # libsemanage seems to need -fPIC everywhere - buildInputs = [ pkgconfig libsepol pcre ] ++ optionals enablePython [ swig python ]; - prePatch = '' - tar xvf ${patch_src} - for p in gentoo-patches/*.patch; do - patch -p1 < "$p" - done - ''; - postPatch = optionalString enablePython '' sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile ''; - installFlags = [ "PREFIX=$(out)" "DESTDIR=$(out)" "LIBSEPOLDIR=${libsepol}" ]; + installFlags = [ "PREFIX=$(out)" "DESTDIR=$(out)" ]; installTargets = [ "install" ] ++ optional enablePython "install-pywrap"; + # TODO: Figure out why the build incorrectly links libselinux.so + postInstall = '' + rm $out/lib/libselinux.so + ln -s libselinux.so.1 $out/lib/libselinux.so + ''; + meta = { inherit (libsepol.meta) homepage platforms maintainers; }; diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 28908189cf32..afd83f730806 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex }: +{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, audit }: stdenv.mkDerivation rec { name = "libsemanage-${version}"; - version = "2.1.9"; + version = "2.2"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz"; - sha256 = "1k1my3n1pj30c5887spykcdk1brgxfpxmrz6frxjyhaijxzx20bg"; + sha256 = "0xdx0dwcsyw4kv9l6xwdkfg6v7fc9b5y176rkg6n6q0w1zx0pxhi"; }; makeFlags = "PREFIX=$(out) DESTDIR=$(out)"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fstack-protector-all"; NIX_CFLAGS_LINK = "-lsepol"; - buildInputs = [ libsepol libselinux ustr bzip2 bison flex ]; + buildInputs = [ libsepol libselinux ustr bzip2 bison flex audit ]; meta = with stdenv.lib; { inherit (libsepol.meta) homepage platforms maintainers; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index d41d1cbe7522..793137aa21a4 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -2,17 +2,23 @@ stdenv.mkDerivation rec { name = "libsepol-${version}"; - version = "2.1.8"; - se_release = "20120924"; + version = "2.2"; + se_release = "20131030"; se_url = "${meta.homepage}/releases"; src = fetchurl { url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; - sha256 = "1w38q3lmha5m9aps9w844i51yw4b8q1vhpng2kdywn2n8cpdvvk3"; + sha256 = "03zw6clp00cmi49x8iq8svhrp91jrcw0093zpnyhan190rqb593p"; }; preBuild = '' makeFlags="$makeFlags PREFIX=$out DESTDIR=$out" ''; + # TODO: Figure out why the build incorrectly links libsepol.so + postInstall = '' + rm $out/lib/libsepol.so + ln -s libsepol.so.1 $out/lib/libsepol.so + ''; + passthru = { inherit se_release se_url meta; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 53127e4458ce..bd748dadf616 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }: let - v = "2.02.100"; + v = "2.02.104"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${v}.tgz"; - md5 = "9629cf5728544d7e637cafde1f73d777"; + sha256 = "1xa7hvp8bsx96nncgksxrqxaqcgipfmmpr8aysayb8aisyjvas0d"; }; configureFlags = diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index b60b6134fdde..5c36bb097812 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -10,7 +10,7 @@ let rev = "7fa99818367a6d17014b36d6f918ad848cbe7ce2"; - version = "1.0pre-${rev}"; + version = "1.0pre-${stdenv.lib.strings.substring 0 7 rev}"; sha256 = "15eea3acd76190c7922c71028b31963221a2eefd8afa713879e191a26bc22ae7"; in stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 1653c018ce14..48e1c1784900 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,16 +1,13 @@ { stdenv, fetchurl, groff }: stdenv.mkDerivation rec { - name = "mdadm-3.1.2"; + name = "mdadm-3.3"; src = fetchurl { url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2"; - sha256 = "0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz"; + sha256 = "0igdqflihiq1dp5qlypzw0xfl44f4n3bckl7r2x2wfgkplcfa1ww"; }; - # Enable incremental activation of swraid arrays from udev. - patches = [ ./udev.patch ]; - nativeBuildInputs = [ groff ]; preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile"; @@ -19,7 +16,7 @@ stdenv.mkDerivation rec { # /dev/.mdadm/map as a fallback). preBuild = '' - makeFlagsArray=(INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man VAR_RUN=/var/run/mdadm ALT_RUN=/dev/.mdadm) + makeFlagsArray=(INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man RUN_DIR=/dev/.mdadm) if [[ -n "$crossConfig" ]]; then makeFlagsArray+=(CROSS_COMPILE=$crossConfig-) fi diff --git a/pkgs/os-specific/linux/mdadm/udev.patch b/pkgs/os-specific/linux/mdadm/udev.patch deleted file mode 100644 index 5eb35f0c584c..000000000000 --- a/pkgs/os-specific/linux/mdadm/udev.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --exclude '*~' -rc mdadm-3.1.2-orig/udev-md-raid.rules mdadm-3.1.2/udev-md-raid.rules -*** mdadm-3.1.2-orig/udev-md-raid.rules 2010-02-22 21:14:58.000000000 +0100 ---- mdadm-3.1.2/udev-md-raid.rules 2010-05-16 20:45:22.000000000 +0200 -*************** -*** 5,11 **** - ACTION=="change", GOTO="md_no_incr" - - # import data from a raid member and activate it -! #ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}" - # import data from a raid set - LABEL="md_no_incr" - KERNEL!="md*", GOTO="md_end" ---- 5,11 ---- - ACTION=="change", GOTO="md_no_incr" - - # import data from a raid member and activate it -! ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}" - # import data from a raid set - LABEL="md_no_incr" - KERNEL!="md*", GOTO="md_end" diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 35595a7b8f4f..02eb65123d80 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; let - versionNumber = "319.60"; + versionNumber = "331.20"; in @@ -19,21 +19,16 @@ stdenv.mkDerivation { builder = ./builder.sh; - patches = - [ ./version-test.patch ] - ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.11") ./nvidia-drivers-linux-3.11-incremental.patch - ; - src = if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0kjidkwd2b5aik74663mxk3ffq4a3fmaybq2aq1lcbfhvvh49j6j"; + sha256 = "0icpmfsppnsvk7vj0fshi3ry4s1wix435s2c8wwak47765fv1mks"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0fhrxcfsw2jaycnz9gr04c9w585wydx8kpm6rjjbw19wkf8hlq3z"; + sha256 = "02503dis3ngraqv7174a4pay2x08hp697n9q74rpjjclf5k74ax1"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; @@ -58,5 +53,7 @@ stdenv.mkDerivation { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for NVIDIA graphics cards"; license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch deleted file mode 100644 index bb6fad932e3c..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8a8647ad942c8ac5161e1335f7f3e9dbb34dbf9e Mon Sep 17 00:00:00 2001 -From: Lukas Elsner <open@mindrunner.de> -Date: Wed, 17 Jul 2013 01:16:04 +0200 -Subject: [PATCH] replace num_physpages with totalram_pages - ---- - kernel/nv-linux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h -index 4e5ed89..46c51ec 100644 ---- a/kernel/nv-linux.h -+++ b/kernel/nv-linux.h -@@ -957,7 +957,7 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info) - #endif - - #if !defined(NV_VMWARE) --#define NV_NUM_PHYSPAGES num_physpages -+#define NV_NUM_PHYSPAGES totalram_pages - #define NV_GET_CURRENT_PROCESS() current->tgid - #define NV_IN_ATOMIC() in_atomic() - #define NV_LOCAL_BH_DISABLE() local_bh_disable() --- -1.8.3.2 - diff --git a/pkgs/os-specific/linux/nvidia-x11/version-test.patch b/pkgs/os-specific/linux/nvidia-x11/version-test.patch deleted file mode 100644 index 9b6908ee5c0a..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/version-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh NVIDIA-patched/kernel/conftest.sh ---- NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh 2013-01-14 18:11:17.000000000 -0430 -+++ NVIDIA-patched/kernel/conftest.sh 2013-02-05 14:44:50.757999124 -0430 -@@ -1699,11 +1699,13 @@ - # kernel older than 2.6.6, that's all we require to - # build the module. - # -+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) - PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) - SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) - -- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ -- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then -+ if [ -n "$VERSION" -a -n "$PATCHLEVEL" -a -n "$SUBLEVEL" \ -+ -a "$VERSION" -ge 3 -o "$VERSION" -eq 2 -a "$PATCHLEVEL" -ge 7 \ -+ -o "$PATCHLEVEL" -eq 6 -a "$SUBLEVEL" -ge 6 ]; then - SELECTED_MAKEFILE=Makefile.kbuild - RET=0 - fi diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index e49525a42bfc..5c7e704390b5 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -1,23 +1,24 @@ { stdenv, fetchurl, intltool, pcre, libcap_ng, libcgroup -, libsepol, libselinux, libsemanage +, libsepol, libselinux, libsemanage, setools , python, sepolgen }: stdenv.mkDerivation rec { name = "policycoreutils-${version}"; - version = "2.1.13"; + version = "2.2.4"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz"; - sha256 = "1145nbpwndmhma08vvj1j75bjd8xhjal0vjpazlrw78iyc30y11l"; + sha256 = "08zpd2a2j45j1qkmq9sz084r2xr0fky1cnld45sn8w5xgdw8k81n"; }; patchPhase = '' substituteInPlace po/Makefile --replace /usr/bin/install install + find . -type f -exec sed -i 's,/usr/bin/python,${python}/bin/python,' {} \; ''; buildInputs = [ intltool pcre libcap_ng libcgroup - libsepol libselinux libsemanage + libsepol libselinux libsemanage setools python sepolgen # ToDo? these are optional ]; @@ -25,6 +26,11 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib" && cp -s "${libsepol}/lib/libsepol.a" "$out/lib" ''; + # Creation of the system-config-selinux directory is broken + preInstall = '' + mkdir -p $out/share/system-config-selinux + ''; + NIX_CFLAGS_COMPILE = "-fstack-protector-all"; NIX_LDFLAGS = "-lsepol -lpcre"; diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/pkgs/os-specific/linux/sepolgen/default.nix index 7139ec98c285..812b100699f7 100644 --- a/pkgs/os-specific/linux/sepolgen/default.nix +++ b/pkgs/os-specific/linux/sepolgen/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "sepolgen-${version}"; - version = "1.1.8"; + version = "1.2.1"; inherit (libsepol) se_release se_url; src = fetchurl { url = "${se_url}/${se_release}/sepolgen-${version}.tar.gz"; - sha256 = "1sssc9d4wz7l23yczlzplsmdr891sqr9w34ccn1bfwlnc4q63xdm"; + sha256 = "1c41hz4a64mjvbfhgc7c7plydahsc161z0qn46qz2g3bvimj9323"; }; makeFlags = "PREFIX=$(out) DESTDIR=$(out) PYTHONLIBDIR=lib/${python.libPrefix}/site-packages"; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix new file mode 100644 index 000000000000..c95d27005efb --- /dev/null +++ b/pkgs/os-specific/linux/setools/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, autoreconfHook, pkgconfig, bison, flex +, python, swig2, tcl, libsepol, libselinux, libxml2, sqlite, bzip2 }: + +stdenv.mkDerivation rec { + name = "setools-3.3.8"; + + src = fetchurl { + url = "http://oss.tresys.com/projects/setools/chrome/site/dists/${name}/${name}.tar.bz2"; + sha256 = "16g987ijaxabc30zyjzia4nafq49rm038y1pm4vca7i3kb67wf24"; + }; + + # SWIG-TCL is broken in 3.3.8 + configureFlags = '' + --with-tcl=${tcl}/lib + --with-sepol-devel=${libsepol} + --with-selinux-devel=${libselinux} + --disable-gui + --disable-swig-tcl + ''; + + buildInputs = [ autoreconfHook pkgconfig bison flex python swig2 ]; + + nativeBuildInputs = [ tcl libsepol libselinux libxml2 sqlite bzip2 ]; + + meta = { + description = "SELinux Tools"; + homepage = "http://oss.tresys.com/projects/setools/"; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index d5dc292ac339..cba4a510ff06 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.19"; + name = "upower-0.9.23"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "053yahks5c7nwdxwx8q6nqp3mxbqldmc844mzyvc3ws9635zmisl"; + sha256 = "06wqhab2mn0j4biiwh7mn4kxbxnfnzjkxvhpgvnlpaz9m2q54cj3"; }; buildInputs = @@ -19,14 +19,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - configureFlags = - [ "--with-backend=linux" "--localstatedir=/var" ] - ++ stdenv.lib.optional useSystemd - [ "--enable-systemd" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-systemdutildir=$(out)/lib/systemd/system-sleep" - ]; - preConfigure = '' substituteInPlace src/linux/up-backend.c \ @@ -36,6 +28,17 @@ stdenv.mkDerivation rec { --replace /usr/bin/dbus-send ${dbus_tools}/bin/dbus-send ''; + configureFlags = + [ "--with-backend=linux" "--localstatedir=/var" + "--enable-deprecated" # needed for Xfce (Nov 2013) + ] + ++ stdenv.lib.optional useSystemd + [ "--enable-systemd" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-systemdutildir=$(out)/lib/systemd/system-sleep" + "--with-udevrulesdir=$(out)/lib/udev/rules.d" + ]; + NIX_CFLAGS_LINK = "-lgcc_s"; installFlags = "historydir=$(TMPDIR)/foo"; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index d42424e6fc86..3f676d37dd87 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }: - +let + ver = "2.24"; +in stdenv.mkDerivation rec { - name = "util-linux-2.22.2"; + name = "util-linux-${ver}"; src = fetchurl { - url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.22/${name}.tar.bz2"; - sha256 = "0vf3ifb45gr4cd27pmmxk8y5b3r0920mv16fv0vfwz5705xa2qvl"; + url = "http://www.kernel.org/pub/linux/utils/util-linux/v${ver}/${name}.tar.bz2"; + sha256 = "1nfnymj03rdcxjb677a9qq1zirppr8csh32cb85qm23x5xndi6v3"; }; crossAttrs = { diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index 698a7ab4ec88..4c6045e1a6cb 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { homepage = http://dev.gentoo.org/~spock/projects/uvesafb/; license = "BSD"; platforms = [ "i686-linux" "x86_64-linux" ]; + broken = true; }; } diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 29591bf0335c..59a3c51c4d6e 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { meta = { description = "Qt-based GUI for wpa_supplicant"; - inherit (qt4.meta) platforms; + platforms = stdenv.lib.platforms.linux; }; } |