[tor-commits] [tor-browser-build/master] Bug 40039: Remove version_path in nss project

[gk@xxxxxxxxxxxxxx]

commit e7d0ada804cff79b101a0b4b7517133c80f25f31
Author: Nicolas Vigier <boklm@xxxxxxxxxxxxxx>
Date:   Thu Aug 13 09:47:06 2020 +0200

    Bug 40039: Remove version_path in nss project
    
    Instead we generate the string from the version.
---
 projects/nss/config | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/projects/nss/config b/projects/nss/config
index e2b875e..b260e77 100644
--- a/projects/nss/config
+++ b/projects/nss/config
@@ -3,8 +3,6 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil
 # The required versions for application-services can be found at the respective
 # commit in libs/build-all.sh
 version: 3.54
-# XXX: maybe that's extractable automatically from `version` somehow?
-version_path: 3_54
 nspr_version: 4.26
 var:
   container:
@@ -19,7 +17,7 @@ input_files:
     project: '[% c("var/compiler") %]'
   - name: ninja
     project: ninja
-  - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("version_path") %]_RTM/src/nss-[% c("version") %]-with-nspr-[% c("nspr_version") %].tar.gz'
+  - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("version") | replace("\\.", "_") %]_RTM/src/nss-[% c("version") %]-with-nspr-[% c("nspr_version") %].tar.gz'
     name: nss
     sha256sum: e0e81f0ff264d810f130d3cd9334722f7f883c752430483131d1ca5ac62d3f70
   - filename: configure.patch

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits