From 9448893b9655081bec56d2aec4e9c938e9a86f30 Mon Sep 17 00:00:00 2001
From: jakubgs <jakubgs@users.noreply.github.com>
Date: Mon, 3 Oct 2022 18:35:02 +0000
Subject: [PATCH] deploy: eba17319e81f67ef17148cabd7d7961ea4ec1782

---
 ci/Jenkinsfile.prs                            | 22 +++++++++++++------
 shell.nix                                     | 16 ++++++++++++++
 .../vendor/libbacktrace-upstream/libtool      |  2 +-
 3 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 shell.nix

diff --git a/ci/Jenkinsfile.prs b/ci/Jenkinsfile.prs
index b33690ca0..4db5d3f16 100644
--- a/ci/Jenkinsfile.prs
+++ b/ci/Jenkinsfile.prs
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.2.18'
+library 'status-jenkins-lib@v1.6.0'
 
 pipeline {
   agent { label "${getAgentLabel()} && x86_64" }
@@ -53,19 +53,23 @@ pipeline {
       v1changed = versionWasChanged('v1')
       v2changed = versionWasChanged('v2')
       /* TODO: Re-add caching of Nim compiler. */
-      sh "make V=${params.VERBOSITY} update"
-      sh "make V=${params.VERBOSITY} deps"
+      nix.shell("make V=${params.VERBOSITY} update", pure: false)
+      nix.shell("make V=${params.VERBOSITY} deps", pure: false)
     } } }
 
     stage('Binaries') {
       parallel {
         stage('V1') { 
           when { expression { v1changed } }
-          steps { sh "make V=${params.VERBOSITY} v1" }
+          steps { script {
+            nix.shell("make V=${params.VERBOSITY} v1")
+          } }
         }
         stage('V2') {
           when { expression { v2changed } }
-          steps { sh "make V=${params.VERBOSITY} v2" }
+          steps { script {
+            nix.shell("make V=${params.VERBOSITY} v2")
+          } }
         }
       }
     }
@@ -74,11 +78,15 @@ pipeline {
       parallel {
         stage('V1') {
           when { expression { v1changed } }
-          steps { sh "make V=${params.VERBOSITY} test1" }
+          steps { script {
+            nix.shell("make V=${params.VERBOSITY} test1")
+          } }
         }
         stage('V2') {
           when { expression { v2changed } }
-          steps { sh "make V=${params.VERBOSITY} test2" }
+          steps { script {
+            nix.shell("make V=${params.VERBOSITY} test2")
+          } }
         }
       }
     }
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 000000000..9f3206753
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,16 @@
+{ pkgs ? import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/dbf1d73cd1a17276196afeee169b4cf7834b7a96.tar.gz";
+  sha256 = "sha256:1k5nvn2yzw370cqsfh62lncsgydq2qkbjrx34cprzf0k6b93v7ch";
+}) {} }:
+
+pkgs.mkShell {
+  name = "nim-waku-build-shell";
+
+  # Versions dependent on nixpkgs commit. Update manually.
+  buildInputs = with pkgs; [
+    git   # 2.37.3
+    which # 2.21
+    gcc   # 11.3.0
+    rustc # 1.63.0
+  ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
+}
diff --git a/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool b/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool
index b87656586..34ef6d34f 100755
--- a/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool
+++ b/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool
@@ -2,7 +2,7 @@
 
 # libtool - Provide generalized library-building support services.
 # Generated automatically by config.status (libbacktrace) version-unused
-# Libtool was configured on host fv-az190-137:
+# Libtool was configured on host fv-az619-657:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,