Use newer Fedora/Ubuntu releases

Author: edolstra

release.nix

@@ -45,12 +45,10 @@ let
       });
 
 
-    rpm_fedora20i386 = makeRPM_i686 (diskImages: diskImages.fedora20i386);
-    rpm_fedora20x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora20x86_64);
-    rpm_fedora21i386 = makeRPM_i686 (diskImages: diskImages.fedora21i386);
-    rpm_fedora21x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora21x86_64);
-    rpm_fedora23i386 = makeRPM_i686 (diskImages: diskImages.fedora23i386);
-    rpm_fedora23x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora23x86_64);
+    rpm_fedora24i386 = makeRPM_i686 (diskImages: diskImages.fedora24i386);
+    rpm_fedora24x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora24x86_64);
+    rpm_fedora25i386 = makeRPM_i686 (diskImages: diskImages.fedora25i386);
+    rpm_fedora25x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora25x86_64);
 
     deb_debian7i386 = makeDeb_i686 (diskImages: diskImages.debian7i386);
     deb_debian7x86_64 = makeDeb_x86_64 (diskImages: diskImages.debian7x86_64);
@@ -59,12 +57,10 @@ let
 
     deb_ubuntu1404i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1404i386);
     deb_ubuntu1404x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1404x86_64);
-    deb_ubuntu1410i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1410i386);
-    deb_ubuntu1410x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1410x86_64);
-    deb_ubuntu1504i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1504i386);
-    deb_ubuntu1504x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1504x86_64);
-    deb_ubuntu1510i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1510i386);
-    deb_ubuntu1510x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1510x86_64);
+    deb_ubuntu1604i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1604i386);
+    deb_ubuntu1604x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1604x86_64);
+    deb_ubuntu1610i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1610i386);
+    deb_ubuntu1610x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1610x86_64);
 
 
     release = pkgs.releaseTools.aggregate
@@ -76,12 +72,12 @@ let
             #build.x86_64-freebsd
             #build.i686-freebsd
             #build.x86_64-darwin
-            rpm_fedora23i386
-            rpm_fedora23x86_64
+            rpm_fedora25i386
+            rpm_fedora25x86_64
             deb_debian8i386
             deb_debian8x86_64
-            deb_ubuntu1510i386
-            deb_ubuntu1510x86_64
+            deb_ubuntu1610i386
+            deb_ubuntu1610x86_64
           ];
         meta.description = "Release-critical builds";
       };