7 files changed, 55 insertions, 48 deletions
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index d773c08e189..4cef66a5c2e 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "astroid";
-  version = "2.0.4";
+  version = "2.1.0";
 
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c7013d119ec95eb626f7a2011f0b63d0c9a095df9ad06d8507b37084eada1a8d";
+    sha256 = "08hz675knh4294bancdapql392fmbjyimhbyrmfkz1ka7l035c1m";
   };
 
   # From astroid/__pkginfo__.py
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 4f4eb3cfc73..d5eec0f73bd 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "pylint";
-  version = "2.1.1";
+  version = "2.2.2";
 
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "31142f764d2a7cd41df5196f9933b12b7ee55e73ef12204b648ad7e556c119fb";
+    sha256 = "14klyan9lqanyi8qhrbn65k7bgv9p7i7ply662r2lr27wydf57b8";
   };
 
   checkInputs = [ pytest pytestrunner pyenchant ];
diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix
index 8ad3a103c93..5cbedf403d2 100644
--- a/pkgs/development/r-modules/wrapper-rstudio.nix
+++ b/pkgs/development/r-modules/wrapper-rstudio.nix
@@ -1,15 +1,15 @@
-{ stdenv, R, rstudio, makeWrapper, recommendedPackages, packages, qtbase }:
+{ lib, runCommand, R, rstudio, makeWrapper, recommendedPackages, packages, qtbase }:
 
 let
-  qtVersion = with stdenv.lib.versions; "${major qtbase.version}.${minor qtbase.version}";
+  qtVersion = with lib.versions; "${major qtbase.version}.${minor qtbase.version}";
 in
-stdenv.mkDerivation rec {
+runCommand (rstudio.name + "-wrapper") {
+  preferLocalBuild = true;
+  allowSubstitutes = false;
 
-  name = rstudio.name + "-wrapper";
+  nativeBuildInputs = [makeWrapper];
 
-  buildInputs = [makeWrapper R rstudio] ++ recommendedPackages ++ packages;
-
-  unpackPhase = ":";
+  buildInputs = [R rstudio] ++ recommendedPackages ++ packages;
 
   # rWrapper points R to a specific set of packages by using a wrapper
   # (as in https://nixos.org/nixpkgs/manual/#r-packages) which sets
@@ -20,18 +20,14 @@ stdenv.mkDerivation rec {
   # into an R file (fixLibsR) which achieves the same effect, then
   # uses R_PROFILE_USER to load this code at startup in RStudio.
   fixLibsR = "fix_libs.R";
-  installPhase = ''
-    mkdir $out
-    echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/${fixLibsR}
-    echo -n ".libPaths(c(.libPaths(), \"" >> $out/${fixLibsR}
-    echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/${fixLibsR}
-    echo -n "\"))" >> $out/${fixLibsR}
-    echo >> $out/${fixLibsR}
-    makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio --set R_PROFILE_USER $out/${fixLibsR} \
-      --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins    
-  '';
-  
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
 }
+''
+mkdir $out
+echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/$fixLibsR
+echo -n ".libPaths(c(.libPaths(), \"" >> $out/$fixLibsR
+echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/$fixLibsR
+echo -n "\"))" >> $out/$fixLibsR
+echo >> $out/$fixLibsR
+makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio --set R_PROFILE_USER $out/$fixLibsR \
+  --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
+''
diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix
index d77c24e913d..76e819501a5 100644
--- a/pkgs/development/r-modules/wrapper.nix
+++ b/pkgs/development/r-modules/wrapper.nix
@@ -1,25 +1,21 @@
-{ stdenv, R, makeWrapper, recommendedPackages, packages }:
+{ runCommand, R, makeWrapper, recommendedPackages, packages }:
 
-stdenv.mkDerivation {
-  name = R.name + "-wrapper";
+runCommand (R.name + "-wrapper") {
+  preferLocalBuild = true;
+  allowSubstitutes = false;
 
-  buildInputs = [makeWrapper R] ++ recommendedPackages ++ packages;
+  buildInputs = [R] ++ recommendedPackages ++ packages;
 
-  # Make the list of recommended R packages accessible to other packages such as rpy2
-  passthru.recommendedPackages = recommendedPackages;
-
-  unpackPhase = ":";
+  nativeBuildInputs = [makeWrapper];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cd ${R}/bin
-    for exe in *; do
-      makeWrapper ${R}/bin/$exe $out/bin/$exe \
-        --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
-    done
-  '';
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
+  # Make the list of recommended R packages accessible to other packages such as rpy2
+  passthru = { inherit recommendedPackages; };
 }
+''
+mkdir -p $out/bin
+cd ${R}/bin
+for exe in *; do
+  makeWrapper ${R}/bin/$exe $out/bin/$exe \
+    --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
+done
+''
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 7a401f88be3..ecfdc1b027c 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.138.3";
+  version = "2.150.1";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "0z8yfnqg43vqhhnp27wb28686zq9kqkyicqn0162hr9h5pd4sglm";
+    sha256 = "0sb6mzynw1vg6s43mpd7b0dz1clbf8akga09i14q66isb9nmhf3s";
   };
 
   buildCommand = ''
diff --git a/pkgs/development/tools/tradcpp/aarch64.patch b/pkgs/development/tools/tradcpp/aarch64.patch
new file mode 100644
index 00000000000..ef7ad9828ac
--- /dev/null
+++ b/pkgs/development/tools/tradcpp/aarch64.patch
@@ -0,0 +1,12 @@
+diff a/config.h b/config.h
+--- a/config.h
++++ b/config.h
+@@ -124,6 +124,8 @@
+ #define CONFIG_CPU "__ppc64__"
+ #elif defined(__ARM__)
+ #define CONFIG_CPU "__ARM__"
++#elif defined(__aarch64__)
++#define CONFIG_CPU "__aarch64__"
+ #else
+ /* let it go */
+ #endif
diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix
index 64a97ad0087..7f395174bb4 100644
--- a/pkgs/development/tools/tradcpp/default.nix
+++ b/pkgs/development/tools/tradcpp/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation {
   # tradcpp only comes with BSD-make Makefile; the patch adds configure support
   buildInputs = [ autoconf ];
   preConfigure = "autoconf";
-  patches = [ ./tradcpp-configure.patch ];
+  patches = [
+    ./tradcpp-configure.patch
+    ./aarch64.patch
+  ];
 
   meta = with stdenv.lib; {
     description = "A traditional (K&R-style) C macro preprocessor";