diff --git a/n/nano/nano-6.4-GCCcore-11.3.0.eb b/n/nano/nano-7.0-GCCcore-11.3.0.eb
similarity index 62%
rename from n/nano/nano-6.4-GCCcore-11.3.0.eb
rename to n/nano/nano-7.0-GCCcore-11.3.0.eb
index d18c2355..37267b01 100644
--- a/n/nano/nano-6.4-GCCcore-11.3.0.eb
+++ b/n/nano/nano-7.0-GCCcore-11.3.0.eb
@@ -1,10 +1,10 @@
-# IT4Innovations 2022
-# JK
+# Contribution from IT4Innovations National Supercomputing Center, Czech Republic
+# Jakub Kropacek, 2022
 
 easyblock = 'ConfigureMake'
 
 name = 'nano'
-version = '6.4'
+version = '7.0'
 
 homepage = 'https://www.nano-editor.org/'
 docurls = 'https://www.nano-editor.org/docs.php'
@@ -12,15 +12,12 @@ description = """a simple editor, inspired by Pico"""
 
 toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
 
-source_urls = ['https://www.nano-editor.org/dist/v6/']
+source_urls = ['https://www.nano-editor.org/dist/v%(version_major)s/']
 sources = [SOURCE_TAR_GZ]
-checksums = ['85ebd9b4dba49839821d529bea16ac1acae0c9b9db2157531e40c9dffeb1b656']
+checksums = ['767d595237a4b40b981e2daaeb31de94283d60b1fae03fbd52a67d95c454518a']
 
 builddependencies = [('binutils', '2.38')]
-<<<<<<< HEAD:n/nano/nano-6.4-GCCcore-11.3.0.eb
-=======
 
->>>>>>> 6c09b493988042e7963e7dd1bda6d4d088db2282:n/nano/nano-6.4.eb
 dependencies = [('ncurses', '6.3')]
 
 sanity_check_paths = {
diff --git a/t/Tensorflow/TensorFlow-2.9.1-foss-2022a-CUDA-11.7.0.eb b/t/Tensorflow/TensorFlow-2.9.1-foss-2022a-CUDA-11.7.0.eb
index f4159ab6..96efaaa9 100644
--- a/t/Tensorflow/TensorFlow-2.9.1-foss-2022a-CUDA-11.7.0.eb
+++ b/t/Tensorflow/TensorFlow-2.9.1-foss-2022a-CUDA-11.7.0.eb
@@ -168,7 +168,7 @@ exts_list = [
             'TensorFlow-2.5.0-fix-alias-violation-in-absl.patch',
             'TensorFlow-2.5.0_fix-crash-on-shutdown.patch',
             'TensorFlow-2.7.1_fix_cpu_count.patch',
-            'TensorFlow-2.9.1_fix-protobuf-include-def.patch',
+            'TensorFlow-2.9.1_fix-include-def.patch',
         ],
         'source_tmpl': 'v%(version)s.tar.gz',
         'source_urls': ['https://github.com/tensorflow/tensorflow/archive/'],
@@ -215,8 +215,8 @@ exts_list = [
              '578c7493221ebd3dc25ca43d63a72cbb28fdf4112b1e2baa7390f25781bd78fd'},
             {'TensorFlow-2.7.1_fix_cpu_count.patch':
              '5427a4cff0afc2fe5b24776ae9ca3616c56a79c1fde0025b37bec24837bb0698'},
-            {'TensorFlow-2.9.1_fix-protobuf-include-def.patch':
-             '97ce554516857e6f94415bdd8a8cb201abb34e9297a4946f91143587f110eb6d'},
+            {'TensorFlow-2.9.1_fix-include-def.patch':
+             'ecebb6f7009cffffb9254b4fd8d3dc345071ea3e911a36bdea7d65c21dd21c20'},
         ],
     }),
 ]
diff --git a/t/Tensorflow/TensorFlow-2.9.1_fix-protobuf-include-def.patch b/t/Tensorflow/TensorFlow-2.9.1_fix-include-def.patch
similarity index 75%
rename from t/Tensorflow/TensorFlow-2.9.1_fix-protobuf-include-def.patch
rename to t/Tensorflow/TensorFlow-2.9.1_fix-include-def.patch
index ecccc684..f4a3b5a7 100644
--- a/t/Tensorflow/TensorFlow-2.9.1_fix-protobuf-include-def.patch
+++ b/t/Tensorflow/TensorFlow-2.9.1_fix-include-def.patch
@@ -1,13 +1,14 @@
-Fix an issue where google/protobuf/port_def.inc is not found.
+Fix an issue where google/protobuf/port_def.inc or io_coded_stream dependencies are not found.
 
 diff -ruN tensorflow-2.9.1_old/third_party/systemlibs/protobuf.BUILD tensorflow-2.9.1/third_party/systemlibs/protobuf.BUILD
 --- tensorflow-2.9.1_old/third_party/systemlibs/protobuf.BUILD	2022-11-10 16:57:13.649126750 +0100
 +++ tensorflow-2.9.1/third_party/systemlibs/protobuf.BUILD	2022-11-10 17:00:42.548576599 +0100
-@@ -43,6 +43,7 @@
+@@ -43,6 +43,8 @@
          ],
      ),
      "wrappers": ("google/protobuf/wrappers.proto", []),
 +    "port_def": ("google/protobuf/port_def.inc", []),
++    "coded_stream": ("google/protobuf/io/coded_stream.h", []),
  }
  
  RELATIVE_WELL_KNOWN_PROTOS = [proto[1][0] for proto in WELL_KNOWN_PROTO_MAP.items()]
diff --git a/t/Tensorflow/TensorFlow-2.9.1_test.patch b/t/Tensorflow/TensorFlow-2.9.1_test.patch
new file mode 100644
index 00000000..238f31dd
--- /dev/null
+++ b/t/Tensorflow/TensorFlow-2.9.1_test.patch
@@ -0,0 +1,12 @@
+diff -ruN tensorflow-2.9.1_old/third_party/systemlibs/protobuf.BUILD tensorflow-2.9.1/third_party/systemlibs/protobuf.BUILD
+--- tensorflow-2.9.1_old/third_party/systemlibs/protobuf.BUILD  2022-11-10 16:57:13.649126750 +0100
++++ tensorflow-2.9.1/third_party/systemlibs/protobuf.BUILD      2022-11-10 17:00:42.548576599 +0100
+@@ -43,6 +43,8 @@
+         ],
+     ),
+     "wrappers": ("google/protobuf/wrappers.proto", []),
++    "port_def": ("google/protobuf/port_def.inc", []),
++    "coded_stream": ("google/protobuf/io/coded_stream.h", []),
+ }
+ 
+ RELATIVE_WELL_KNOWN_PROTOS = [proto[1][0] for proto in WELL_KNOWN_PROTO_MAP.items()]