Nixpkgs update

distros/build-env/default.nix

@@ -86,20 +86,8 @@ let
         '';
       };
     };
-  })).overrideAttrs ({ buildCommand, passAsFile ? [], ...}: {
-    # Hack to allow buildEnv to use propagatedBuildInputs
-    buildCommand = null;
-    oldBuildCommand = buildCommand;
-    passAsFile = (if passAsFile == null then [] else passAsFile) ++ [ "oldBuildCommand" ];
-
-    propagatedBuildInputs = propagatedPaths.otherPackages;
-
-    buildPhase = ''
-      runHook preBuild
-      . "$oldBuildCommandPath"
-      runHook postBuild
-    '';
-    phases = [ "buildPhase" "fixupPhase" ];
+  })).overrideAttrs ({ propagatedBuildInputs ? [], ... }: {
+    propagatedBuildInputs = propagatedBuildInputs ++ propagatedPaths.otherPackages;
 
     # Disable redundant fixup operations.
     # The fixupPhase is needed for shell hooks and input propagation, but other

distros/build-env/setup-hook-builder.pl

@@ -7,20 +7,16 @@
 # Read packages list.
 my $pkgs;
 
-if (exists $ENV{"pkgsPath"}) {
-    open FILE, $ENV{"pkgsPath"};
-    $pkgs = <FILE>;
-    close FILE;
-} else {
-    $pkgs = $ENV{"pkgs"}
-}
+open FILE, $ENV{"NIX_ATTRS_JSON_FILE"};
+$pkgs = <FILE>;
+close FILE;
 
 # Create a setup hook that sources the setup hooks of all packages in the
 # environment.
 mkdir "$out/nix-support" unless -d "$out/nix-support";
 open(my $setupHook, '>', "$out/nix-support/setup-hook");
 
-for my $pkg (@{decode_json $pkgs}) {
+for my $pkg (@{decode_json($pkgs)->{chosenOutputs}}) {
     for my $path (@{$pkg->{paths}}) {
         my $pathSetupHook = "$path/nix-support/setup-hook";
         print $setupHook ". $pathSetupHook\n" if -e $pathSetupHook;

distros/distro-overlay.nix

@@ -90,7 +90,7 @@ let
 
     # Some third-party packages are available in rodistro,
     # but have a better packaging in nixpkgs, so use it instead
-    inherit (self.python3Packages) coal eigenpy pinocchio crocoddyl ;
+    inherit (self.python3Packages) coal eigenpy pinocchio crocoddyl tsid;
 
     freeimage = null; # Get rid of freeimage
 
@@ -204,6 +204,10 @@ let
       '';
     });
 
+    # vcstool was replaced by vcs2l in nixpkgs (https://github.com/NixOS/nixpkgs/pull/499630)
+    # TODO: Make this change in rosdep after master is moved to nixpkgs without vcstool.
+    vcstool = self.vcs2l;
+
   } // (mrptOverrides rosSelf rosSuper);
 
   otherSplices = {