Upstream 1.20.2. Generate _juliaver.

2 files changed, 14 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 044c56ad93d7..9b5cc1eafa99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = julia-ijulia
 	pkgdesc = Julia-language backend combined with the Jupyter interactive environment
-	pkgver = 1.20.1
+	pkgver = 1.20.2
 	pkgrel = 1
 	url = https://github.com/JuliaLang/IJulia.jl
 	arch = any
@@ -16,11 +16,11 @@ pkgbase = julia-ijulia
 	depends = julia-softglobalscope
 	depends = julia-zmq
 	depends = jupyter
-	source = julia-ijulia-1.20.1.tar.gz::https://github.com/JuliaLang/IJulia.jl/archive/v1.20.1.tar.gz
-	source = julia-ijulia-1.20.1-Deps.toml::https://raw.githubusercontent.com/JuliaRegistries/General/3d5f64bcb304c00931addd7c3bd68b6e38590b59/I/IJulia/Deps.toml
-	source = julia-ijulia-1.20.1-Package.toml::https://raw.githubusercontent.com/JuliaRegistries/General/3d5f64bcb304c00931addd7c3bd68b6e38590b59/I/IJulia/Package.toml
-	source = julia-ijulia-1.20.1-Versions.toml::https://raw.githubusercontent.com/JuliaRegistries/General/3d5f64bcb304c00931addd7c3bd68b6e38590b59/I/IJulia/Versions.toml
-	sha256sums = 8829d8a5ad0da02de43d268e951081afe16f522ed2592ca08843051152a1aae3
+	source = julia-ijulia-1.20.2.tar.gz::https://github.com/JuliaLang/IJulia.jl/archive/v1.20.2.tar.gz
+	source = julia-ijulia-1.20.2-Deps.toml::https://raw.githubusercontent.com/JuliaRegistries/General/3d5f64bcb304c00931addd7c3bd68b6e38590b59/I/IJulia/Deps.toml
+	source = julia-ijulia-1.20.2-Package.toml::https://raw.githubusercontent.com/JuliaRegistries/General/3d5f64bcb304c00931addd7c3bd68b6e38590b59/I/IJulia/Package.toml
+	source = julia-ijulia-1.20.2-Versions.toml::https://raw.githubusercontent.com/JuliaRegistries/General/3d5f64bcb304c00931addd7c3bd68b6e38590b59/I/IJulia/Versions.toml
+	sha256sums = c58ad61c1e2dc3fa7e79d88d2965b0a5a6a940fbd316a3073ab0ed12ddfd18ec
 	sha256sums = 6a6d750fba39049f4b0a5903b7a7812f2ff89f5ed5132b44f5404451ee7176d6
 	sha256sums = 8f528e7a9177c8b3a30fb17b50b9fbc3bbc4f8a677a3d4cc940446182885e6b0
 	sha256sums = 2ffb78fbd365fbb9db4a16e24a851bcda52cf39553513fb62300dcc8cf356254
diff --git a/PKGBUILD b/PKGBUILD
index 8f3d862ad1bb..ecd56a640348 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=julia-ijulia
 _pkgname=IJulia
-pkgver=1.20.1
+pkgver=1.20.2
 pkgrel=1
 pkgdesc='Julia-language backend combined with the Jupyter interactive environment'
 arch=(any)
@@ -28,7 +28,7 @@ source=($pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz
         $pkgname-$pkgver-Deps.toml::https://raw.githubusercontent.com/JuliaRegistries/General/$_commit/${_pkgname:0:1}/$_pkgname/Deps.toml
         $pkgname-$pkgver-Package.toml::https://raw.githubusercontent.com/JuliaRegistries/General/$_commit/${_pkgname:0:1}/$_pkgname/Package.toml
         $pkgname-$pkgver-Versions.toml::https://raw.githubusercontent.com/JuliaRegistries/General/$_commit/${_pkgname:0:1}/$_pkgname/Versions.toml)
-sha256sums=('8829d8a5ad0da02de43d268e951081afe16f522ed2592ca08843051152a1aae3'
+sha256sums=('c58ad61c1e2dc3fa7e79d88d2965b0a5a6a940fbd316a3073ab0ed12ddfd18ec'
             '6a6d750fba39049f4b0a5903b7a7812f2ff89f5ed5132b44f5404451ee7176d6'
             '8f528e7a9177c8b3a30fb17b50b9fbc3bbc4f8a677a3d4cc940446182885e6b0'
             '2ffb78fbd365fbb9db4a16e24a851bcda52cf39553513fb62300dcc8cf356254')
@@ -41,6 +41,9 @@ _project() {
 	dh_julia distro_project_ "$srcdir"/"$pkgname"-$pkgver-{Package,Versions,Deps}.toml $pkgver
 }
 
+_juliaver="$(/usr/bin/julia -v | cut -f3 -d' ')"
+_juliaver="${_juliaver%.*}"
+
 prepare() {
 	# Generate a Project.toml from Registry metadata
 	rm -f Project.toml && _project
@@ -55,7 +58,7 @@ build() {
 
 	# Fix reference to $srcdir
 	sed -i "s|$srcdir/$_pkgname.jl-$pkgver|/usr/share/julia/vendor/$_pkgname|" \
-	        "$srcdir"/.local/share/jupyter/kernels/julia-1.2/kernel.json
+	        "$srcdir"/.local/share/jupyter/kernels/julia-$_juliaver/kernel.json
 
 	msg2 "NOTE: If the Julia kernel fails to run, clear your $HOME/.julia/cache"
 }
@@ -74,6 +77,6 @@ package() {
 
 	install -Dm644 $_pkgname.jl-$pkgver/LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 
-	install -Dm644 "$srcdir"/.local/share/jupyter/kernels/julia-1.2/kernel.json \
-	               "$pkgdir"/usr/share/jupyter/kernels/julia-1.2/kernel.json
+	install -Dm644 "$srcdir"/.local/share/jupyter/kernels/julia-$_juliaver/kernel.json \
+	               "$pkgdir"/usr/share/jupyter/kernels/julia-$_juliaver/kernel.json
 }