diff options
Diffstat (limited to 'release.nix')
| -rw-r--r-- | release.nix | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/release.nix b/release.nix index 84eda4fa5b28..a126e5d21052 100644 --- a/release.nix +++ b/release.nix @@ -113,34 +113,31 @@ let }; - rpm_fedora5i386 = makeRPM_i686 (diskImages: diskImages.fedora5i386) 10; - rpm_fedora9i386 = makeRPM_i686 (diskImages: diskImages.fedora9i386) 20; - rpm_fedora9x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora9x86_64) 20; - rpm_fedora10i386 = makeRPM_i686 (diskImages: diskImages.fedora10i386) 30; - rpm_fedora10x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora10x86_64) 30; - rpm_fedora11i386 = makeRPM_i686 (diskImages: diskImages.fedora11i386) 40; - rpm_fedora11x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora11x86_64) 40; - rpm_fedora12i386 = makeRPM_i686 (diskImages: diskImages.fedora12i386) 50; - rpm_fedora12x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora12x86_64) 50; + rpm_fedora10i386 = makeRPM_i686 (diskImages: diskImages.fedora10i386) 20; + rpm_fedora10x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora10x86_64) 20; + rpm_fedora11i386 = makeRPM_i686 (diskImages: diskImages.fedora11i386) 30; + rpm_fedora11x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora11x86_64) 30; + rpm_fedora12i386 = makeRPM_i686 (diskImages: diskImages.fedora12i386) 40; + rpm_fedora12x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora12x86_64) 40; + rpm_fedora13i386 = makeRPM_i686 (diskImages: diskImages.fedora13i386) 50; + rpm_fedora13x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora13x86_64) 50; rpm_opensuse103i386 = makeRPM_i686 (diskImages: diskImages.opensuse103i386) 40; rpm_opensuse110i386 = makeRPM_i686 (diskImages: diskImages.opensuse110i386) 50; rpm_opensuse110x86_64 = makeRPM_x86_64 (diskImages: diskImages.opensuse110x86_64) 50; - deb_debian40i386 = makeDeb_i686 (diskImages: diskImages.debian40i386) 40; - deb_debian40x86_64 = makeDeb_x86_64 (diskImages: diskImages.debian40x86_64) 40; - deb_debian50i386 = makeDeb_i686 (diskImages: diskImages.debian50i386) 50; - deb_debian50x86_64 = makeDeb_x86_64 (diskImages: diskImages.debian50x86_64) 50; - deb_ubuntu804i386 = makeDeb_i686 (diskImages: diskImages.ubuntu804i386) 20; - deb_ubuntu804x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu804x86_64) 20; - deb_ubuntu810i386 = makeDeb_i686 (diskImages: diskImages.ubuntu810i386) 30; - deb_ubuntu810x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu810x86_64) 30; - deb_ubuntu904i386 = makeDeb_i686 (diskImages: diskImages.ubuntu904i386) 40; - deb_ubuntu904x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu904x86_64) 40; - deb_ubuntu910i386 = makeDeb_i686 (diskImages: diskImages.ubuntu910i386) 50; - deb_ubuntu910x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu910x86_64) 50; - deb_ubuntu1004i386 = makeDeb_i686 (diskImages: diskImages.ubuntu1004i386) 50; - deb_ubuntu1004x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu1004x86_64) 50; + deb_debian50i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian50i386) 50; + deb_debian50x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.debian50x86_64) 50; + deb_debian60i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian60i386) 50; + deb_debian60x86_64 = makeDeb_x86_64 (diskImageFunsFun: diskImageFunsFun.debian60x86_64) 50; + deb_ubuntu904i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu904i386) 40; + deb_ubuntu904x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu904x86_64) 40; + deb_ubuntu910i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu910i386) 50; + deb_ubuntu910x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu910x86_64) 50; + deb_ubuntu1004i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1004i386) 50; + deb_ubuntu1004x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1004x86_64) 50; + deb_ubuntu1010i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1010i386) 50; + deb_ubuntu1010x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1010x86_64) 50; }; @@ -174,11 +171,12 @@ let releaseTools.debBuild { name = "nix-deb"; src = jobs.tarball; - diskImage = diskImageFun vmTools.diskImages; + diskImage = (diskImageFun vmTools.diskImageFuns) + { extraPackages = [ "libdbd-sqlite3-perl" ]; }; memSize = 1024; meta.schedulingPriority = prio; configureFlags = "--sysconfdir=/etc"; - debRequires = [ "curl" ]; + debRequires = [ "curl" "libdbd-sqlite3-perl" ]; }; |