From bd003198b374c445caa56bd710eb93a01ae733ae Mon Sep 17 00:00:00 2001 From: Mike Sperber Date: Mon, 22 Jun 2015 13:24:33 +0200 Subject: [PATCH 1/4] openssl: patch not needed anymore for darwin platform, closes #8456 The darwin-arch.patch that was needed for previous releases doesn't apply, and also doesn't work anymore. It builds fine without. --- pkgs/development/libraries/openssl/1.0.2.x.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix index 52867440191..e5237515f20 100644 --- a/pkgs/development/libraries/openssl/1.0.2.x.nix +++ b/pkgs/development/libraries/openssl/1.0.2.x.nix @@ -31,9 +31,7 @@ let ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu") [ ./gnu.patch ./kfreebsd-gnu.patch - ] - - ++ stdenv.lib.optional isDarwin ./darwin-arch.patch; + ]; extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch; in From aecc7bd6aa79e337de67502e440e7d10615aeefb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 22 Jun 2015 20:38:43 +0200 Subject: [PATCH 2/4] idea updates idea.clion: 1.0.3 -> 1.0.4 idea.idea-{community,ultimate}: 14.1.3 -> 14.1.4 idea.pycharm-{community,professional}: 4.5.1 -> 4.5.2 idea.webstorm: 10.0.3 -> 10.0.4 --- pkgs/applications/editors/idea/default.nix | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index d22f03d56d9..ff6d3d57eff 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -225,37 +225,37 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "1.0.3"; - build = "141.873"; + version = "1.0.4"; + build = "141.874"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; - sha256 = "0ksxpml6fzj91hnzy59wlgz7q76dhc3715jalacq748y0i1jdh3f"; + sha256 = "1cz59h2znzjy7zncc049f2w30kc89rvmk7l51a1y6ymf9s7cj4cm"; }; }; idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "14.1.3"; - build = "IC-141.1010.3"; + version = "14.1.4"; + build = "IC-141.1532.4"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "104ba057p49l41g9gdcgbywdxyqzkm4rfm7yivkcsddh5drsk4jv"; + sha256 = "1yx93dfbajk2icm2jkfp5s5jnr1czyk179va3n5zndzzhzags4xx"; }; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "14.1.3"; - build = "IU-141.1010.3"; + version = "14.1.4"; + build = "IU-141.1532.4"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "1flg3rpb86xfcxlys5rxywa0z9c6j9h3qd8mkadx5pnay1f97pwi"; + sha256 = "1hxs0mh35r43iqd1i1s2g1ha91q2wnb6xs95w572khzjm5dznvaw"; }; }; @@ -273,25 +273,25 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "4.5.1"; - build = "141.1245"; + version = "4.5.2"; + build = "141.1580"; description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1rjl8r863cm7bn3bkp8kbkb9f35rb344pycg5qlvjlvwvp2f448f"; + sha256 = "09v1ni06h381y7d5cglifwsz81kln2y4ld7hgpz1sn56fwbi8ld9"; }; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "4.5.1"; - build = "141.1245"; + version = "4.5.2"; + build = "141.1580"; description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1wwyggl6941hd034xfsb3avjgvvah9lh0pdmzlndmvm677cdgzz1"; + sha256 = "1dgpzn7wgaxicgw48z83fp462g5mxsr7iwkgp11ffypz93ba2dm7"; }; }; @@ -309,13 +309,13 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "10.0.3"; - build = "141.1237"; + version = "10.0.4"; + build = "141.1550"; description = "Professional IDE for Web and JavaScript devlopment"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "06m852mbiij2dbmiz5y10bd4mhsdg5dmpy8arg75psl2j354spf8"; + sha256 = "171i544ssvjnbr1vq6ncxlj38swsygacavsa427qa4s5wzyvdipj"; }; }; From c48433d5759c06172662d95549f7ffc14f6d1852 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 22 Jun 2015 12:35:37 -0700 Subject: [PATCH 3/4] kernel: 3.4.107 -> 3.4.108 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index eaf5bfad6d8..a0ba7f46c68 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.107"; + version = "3.4.108"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1y3mxisdcnz3kj416bpnnn9cn3wqqjqvcjadhylc1wypqkpcvphq"; + sha256 = "0xdycfbn2j398n1763zkhiv08xsya52acic1zign4s315b45pijm"; }; kernelPatches = args.kernelPatches ++ From bd9433c90de37852bdb276b5737762bb8c24557b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 22 Jun 2015 12:41:23 -0700 Subject: [PATCH 4/4] kernel: Add version 4.1 latest --- pkgs/os-specific/linux/kernel/linux-4.1.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 13 ++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-4.1.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix new file mode 100644 index 00000000000..baee61940cd --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.1"; + modDirVersion = "4.1.0"; + extraMeta.branch = "4.1"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "17rdly75zh49m6r32yy03xappl7ajcqbznq09pm1q7mcb841zxfa"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27169e6ee0d..e35ac93700e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9588,6 +9588,16 @@ let ]; }; + linux_4_1 = makeOverridable (import ../os-specific/linux/kernel/linux-4.1.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.bridge_stp_helper ] @@ -9754,7 +9764,7 @@ let linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = pkgs.linuxPackages_4_0; + linuxPackages_latest = pkgs.linuxPackages_4_1; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -9768,6 +9778,7 @@ let linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); linuxPackages_3_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_19 linuxPackages_3_19); linuxPackages_4_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_0 linuxPackages_4_0); + linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); linuxPackages_custom = {version, src, configfile}: let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile;