diff options
author | William A. Kennington III <william@wkennington.com> | 2015-07-13 15:11:31 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-07-13 15:11:31 -0700 |
commit | 333f145d7604f07e3b2164b459b46e075fea81f4 (patch) | |
tree | cb9bb91bafeafe64c97fa1054223c0d69cf18848 /pkgs/os-specific/linux | |
parent | d253b3d875d2bae84afbc141754b286e18e2fb7d (diff) | |
parent | 7e3c95a0b813394b1a41b73e078d3ffd9e951979 (diff) | |
download | nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.tar nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.tar.gz nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.tar.bz2 nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.tar.lz nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.tar.xz nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.tar.zst nixlib-333f145d7604f07e3b2164b459b46e075fea81f4.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/bluez/bluez5.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/can-utils/default.nix | 9 | ||||
-rw-r--r-- | pkgs/os-specific/linux/firejail/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/hdparm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/jool/cli.nix | 22 | ||||
-rw-r--r-- | pkgs/os-specific/linux/jool/default.nix | 30 | ||||
-rw-r--r-- | pkgs/os-specific/linux/jool/source.nix | 9 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.18.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.0.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 12 | ||||
-rw-r--r-- | pkgs/os-specific/linux/powertop/default.nix | 4 |
14 files changed, 91 insertions, 25 deletions
diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 03c3d5943fe5..1cc990f797b6 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.31"; + name = "bluez-5.32"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "13w1cdybwyb9pww64hp8dwxqq9zs58wh1mq8sslsknb6b3663dn4"; + sha256 = "1xspdw87h2mpy5q36q7225yizgcvxlag1b8qi13h9v6b07kkakzy"; }; pythonPath = with pythonPackages; diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix index 6a3fbd33d689..f181db0c5e3f 100644 --- a/pkgs/os-specific/linux/can-utils/default.nix +++ b/pkgs/os-specific/linux/can-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "can-utils-${version}"; @@ -6,10 +6,11 @@ stdenv.mkDerivation rec { # latest commit in git master as version number. version = "20140227"; - src = fetchgit { - url = "https://git.gitorious.org/linux-can/can-utils.git"; + src = fetchFromGitHub { + owner = "linux-can"; + repo = "can-utils"; rev = "67a2bdcd336e6becfa5784742e18c88dbeddc973"; - sha256 = "0pnnjl141wf3kbf256m6qz9mxz0144z36qqb43skialzcnlhga38"; + sha256 = "1v73b0nk1kb3kp5nbxp4xiygny6nfjgjnm7zgzrjgryvdrnws32z"; }; preConfigure = ''makeFlagsArray+=(PREFIX="$out")''; diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 99c99cd36628..af08d404b826 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -6,7 +6,7 @@ let version="0.9.26"; name="${baseName}-${version}"; hash="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq"; - url="http://softlayer-ams.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.26-rc2.tar.bz2"; + url="mirror://sourceforge/firejail/firejail/firejail-0.9.26-rc2.tar.bz2"; sha256="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index a0cd09fbf35e..538d8d4ab837 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.45"; + name = "hdparm-9.48"; src = fetchurl { url = "mirror://sourceforge/hdparm/${name}.tar.gz"; - sha256 = "0sc6yf3k6sd7n6a2ig2my9fjlqpak3znlyw7jw4cz5d9asm1rc13"; + sha256 = "1vpvlkrksfwx8lxq1p1nk3ddyzgrwy3rgxpn9kslchdh3jkv95yf"; }; preBuild = '' diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix new file mode 100644 index 000000000000..8fb37ed1c5b8 --- /dev/null +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchzip, autoreconfHook, pkgconfig, libnl }: + +let + sourceAttrs = (import ./source.nix) { inherit fetchzip; }; +in + +stdenv.mkDerivation { + name = "jool-cli-${sourceAttrs.version}"; + + src = sourceAttrs.src; + + sourceRoot = "Jool-${sourceAttrs.version}.zip/usr"; + + buildInputs = [ autoreconfHook pkgconfig libnl ]; + + meta = with stdenv.lib; { + homepage = https://www.jool.mx/; + description = "Fairly compliant SIIT and Stateful NAT64 for Linux - CLI tools"; + platforms = platforms.linux; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix new file mode 100644 index 000000000000..fdb2f041a658 --- /dev/null +++ b/pkgs/os-specific/linux/jool/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip, kernel }: + +let + sourceAttrs = (import ./source.nix) { inherit fetchzip; }; +in + +stdenv.mkDerivation { + name = "jool-${sourceAttrs.version}-${kernel.version}"; + + src = sourceAttrs.src; + + prePatch = '' + sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i mod/*/Makefile + ''; + + buildPhase = '' + make -C mod + ''; + + installPhase = '' + make -C mod modules_install INSTALL_MOD_PATH=$out + ''; + + meta = with stdenv.lib; { + homepage = https://www.jool.mx/; + description = "Fairly compliant SIIT and Stateful NAT64 for Linux - kernel modules"; + platforms = platforms.linux; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix new file mode 100644 index 000000000000..196167667e07 --- /dev/null +++ b/pkgs/os-specific/linux/jool/source.nix @@ -0,0 +1,9 @@ +{ fetchzip }: + +rec { + version = "3.3.2"; + src = fetchzip { + url = "https://www.jool.mx/download/Jool-${version}.zip"; + sha256 = "0hc6vlxzmjrgf7vjcwprdqcbx3biq8kphks5k725mrd9rb84drgw"; + }; +} diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 42b90a48097f..3d2b683ee72e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.82"; + version = "3.10.84"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "177rzyd9mxvbacy242abk7annhlm48rbdspr78y5qqsqsgihh88y"; + sha256 = "042cybswcxxzi22h96i4h73a4hcb4drhifs6l9jqlqamdn6xabd3"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 103fbcbcfb9c..377f0271aeaa 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.46"; + version = "3.14.48"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1ran8fi1ldc89x3gpxwkkfl64mln4sl0rq5bbl8imlca5nljmzkb"; + sha256 = "098a7kjfw4jf0f7h6z57f2719jfz3y3jjlcd8y6d95xvhy7xxyw9"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 843172581cc7..b0b4c6ed5bd7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.17"; + version = "3.18.18"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "08512kqvy91jh26jld2h3d9xq3wsfbyylzawjgn75x4r5li6y5ha"; + sha256 = "1fcd4xfnywwb3grdvcnf39njwzb40v10rnzagxqmancsaqy253jv"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix index 3ea4257a1e91..8607bcf70cf3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.0.7"; + version = "4.0.8"; # Remember to update grsecurity! extraMeta.branch = "4.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "01c68w6lygzjzllv7xgnd1hm3339rs0fvd8q26n6bdfa95aj554m"; + sha256 = "1cggqi5kdan818xw5g5wmapcsf501f5m9bympsy6a2cpphknfdmn"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index 5d9a026f6147..5405ae9956d6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.1"; + version = "4.1.2"; extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "12bfih081cbqlgmgq1fqdvvpxga5saj4kkvhawsl4fpg4mybrml8"; + sha256 = "1mdyjhnzhh254cblahqmpsk226z006z6sm9dmwvg6jlhpsw4cjhy"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index ed202d77b387..a8fc01665082 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,17 +65,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.46"; - revision = "201506300711"; + { kversion = "3.14.48"; + revision = "201507111210"; branch = "stable"; - sha256 = "0xjqh7yc4vzgbnql16aylla9b0cjh442sywp8bvkh0ny5m3rj64l"; + sha256 = "0phmqlkx6vqlv79ppf6g4wsx7rwsvwpakpkm9xsq8qazffk7s9qk"; }; grsecurity_unstable = grsecPatch - { kversion = "4.0.7"; - revision = "201506300712"; + { kversion = "4.0.8"; + revision = "201507111211"; branch = "test"; - sha256 = "0rw0wx5nc244m2q7f9y832mmkv8gb8yv1rn1w2pyq8brckiswni7"; + sha256 = "1p9ym8hbwaan9pgxgn8k4rm3n33wl8ag1fzmyr5f4mxs634wgwgx"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index befe16f72f21..9e32cd70cfb7 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ]; + patchPhase = '' + substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" + ''; + meta = { description = "Analyze power consumption on Intel-based laptops"; license = stdenv.lib.licenses.gpl2; |