diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index cfddf4eae8b..dd69d49fe40 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -1,17 +1,16 @@
 # Template file for 'nim'
 pkgname=nim
-version=2.0.14
+version=2.2.2
 revision=1
 _c2version=86742fb02c6606ab01a532a0085784effb2e753e
-_nimbleversion=53fc31936163c44ff12d852d6be0ce1ac9298ab4
+_nimbleversion=4fb6f8e6c33963f6f510fe82d09ad2a61b5e4265
 _checksumsversion=f8f6bd34bfa3fe12c64b919059ad856a96efcba0
 _atlasversion=ac81393c65767422f92d20fbea80e2cefbf9a5d1
 _satversion=faf1617f44d7632ee9601ebc13887644925dcc01
-_zippyversion=117b0cf18bebe9833ca091e3766586d7e48b182b
 build_wrksrc="Nim-$version"
 depends="gcc openssl-devel"
 short_desc="Nim programming language"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Pulux <pulux@pf4sh.eu>"
 license="MIT"
 homepage="https://nim-lang.org/"
 distfiles="https://github.com/nim-lang/Nim/archive/v${version}.tar.gz
@@ -19,44 +18,26 @@ distfiles="https://github.com/nim-lang/Nim/archive/v${version}.tar.gz
  https://github.com/nim-lang/nimble/archive/${_nimbleversion}.zip
  https://github.com/nim-lang/checksums/archive/${_checksumsversion}.zip
  https://github.com/nim-lang/atlas/archive/${_atlasversion}.zip
- https://github.com/nim-lang/sat/archive/${_satversion}.zip
- https://github.com/guzba/zippy/archive/${_zippyversion}.zip"
-checksum="5dd0513b6694d00f1ce07d9adfb47d2ba11c83161229e29ab960aa6cd284fc65
+ https://github.com/nim-lang/sat/archive/${_satversion}.zip"
+checksum="4b70f050fcb64b7cd6e4acc295c6a16feab6f6380127cbee49b02a0cc2c6ce1f
  9c2be306011e0c953bd63a565a4bd6a094e22d3944ca201977c1d03560d0a25c
- 9dfac880b52dfde7a96ed2dd2de6b481e1e16cb499bacc568440486dc0d197dc
+ 3de2002b6a97ae721c6bd078a069feb6500f6ff9fc1ef12bfa6f9de84c401acd
  188bd0f0eb8cedf2d1a7f700af1cd809e529533e5ded05812eecf43fbeb96137
  30f1982748df229c153e524ca4b7145a08b802e2dd3151ac1420bb2a14aea8e9
- a8969e14b0f8e06c6dc5a4ae622e51b209c3e1f24361980917d96e39f3d71114
- a479f7759312c4257804e21633b3f55197767d7e9227c868a6a14f8c84170f46"
+ a8969e14b0f8e06c6dc5a4ae622e51b209c3e1f24361980917d96e39f3d71114"
 
 post_extract() {
 	mv csources_v2-$_c2version $build_wrksrc/csources_v2
 	mkdir $build_wrksrc/dist
 	mv nimble-$_nimbleversion $build_wrksrc/dist/nimble
 	mv checksums-$_checksumsversion $build_wrksrc/dist/checksums
-	mv sat-$_satversion $build_wrksrc/dist/sat
-	mv zippy-$_zippyversion $build_wrksrc/dist/zippy
-	mkdir -p $build_wrksrc/dist/nimble/dist/checksums
-	cp -r $build_wrksrc/dist/checksums $build_wrksrc/dist/nimble/dist
-	mkdir -p $build_wrksrc/dist/nimble/dist/sat
-	cp -r $build_wrksrc/dist/sat $build_wrksrc/dist/nimble/dist
-	mkdir -p $build_wrksrc/dist/nimble/dist/zippy
-	cp -r $build_wrksrc/dist/zippy $build_wrksrc/dist/nimble/dist
-	cp -r $build_wrksrc/dist/nimble/dist/sat/src/sat $build_wrksrc/dist/nimble/src
-	mkdir -p $build_wrksrc/dist/nimble/src/nimblepkg/pkg
-	sed -i -e "s|^import pkg/checksums/sha1.*|import chks/sha1|" $build_wrksrc/dist/nimble/src/nimblepkg/sha1hashes.nim
-	sed -i -e "s|^import pkg/checksums/sha1.*|import chks/sha1|" $build_wrksrc/dist/nimble/src/nimblepkg/checksums.nim
-	cp -r $build_wrksrc/dist/nimble/dist/checksums/src/checksums $build_wrksrc/dist/nimble/src/nimblepkg/chks
-	cp -r $build_wrksrc/dist/nimble/dist/sat/src/sat $build_wrksrc/dist/nimble/src/nimblepkg
-	mkdir -p $build_wrksrc/dist/nimble/src/nimblepkg/zippy
-	cp -r $build_wrksrc/dist/nimble/dist/zippy/src/zippy $build_wrksrc/dist/nimble/src/nimblepkg
-	cp $build_wrksrc/dist/nimble/dist/zippy/src/zippy.nim $build_wrksrc/dist/nimble/src/nimblepkg
-	sed -i -e "s| zippy$| ../zippy|" $build_wrksrc/dist/nimble/src/nimblepkg/zippy/tarballs_v1.nim
-	sed -i -e "s| zippy$| ../zippy|" $build_wrksrc/dist/nimble/src/nimblepkg/zippy/ziparchives_v1.nim
-	sed -i -e "s| zippy, | ../zippy, |" $build_wrksrc/dist/nimble/src/nimblepkg/zippy/ziparchives.nim
+	mkdir -p $build_wrksrc/dist/nimble/dist
+	cp -r $build_wrksrc/dist/checksums $build_wrksrc/dist/nimble/dist/checksums
+	cp -r sat-$_satversion $build_wrksrc/dist/sat
+	cp -r sat-$_satversion $build_wrksrc/dist/nimble/dist/sat
 	mv atlas-$_atlasversion $build_wrksrc/dist/atlas
 	mkdir -p $build_wrksrc/dist/atlas/dist
-	cp -r $build_wrksrc/dist/nimble/dist/sat $build_wrksrc/dist/atlas/dist/sat
+	cp -r sat-$_satversion $build_wrksrc/dist/atlas/dist/sat
 }
 
 do_build() {
@@ -93,10 +74,10 @@ do_build() {
 		$_arch.linux.gcc.linkerexe = "$CC"
 		EDIT
 		bin/nim c -d:release -d:danger --os:linux --cpu:$_arch --listCmd compiler/nim
-		./koch tools --os:linux --cpu:$_arch --listCmd
+		./koch tools --os:linux --cpu:$_arch --listCmd -d:nimNimbleBootstrap
 		vsed -i config/nim.cfg -e '/^# VOIDLINUX TEMP$/,$d'
 	;; *)
-		./koch tools
+		./koch tools -d:nimNimbleBootstrap
 	esac
 }