aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-12-19 13:17:48 +0100
committerEelco Dolstra <edolstra@gmail.com>2019-12-19 13:17:48 +0100
commit9f7b4d068cc106e5d902dc6f52bf46d4a057fd00 (patch)
treeef870a1a8d2f7f1abb3df249c9458e8776081d64
parent4511f09b490fad4ce0dcfbcd7c4fd83b11e7df46 (diff)
Cleanup: Remove unused makeDeb/makeRPM functions
-rw-r--r--release.nix61
1 files changed, 0 insertions, 61 deletions
diff --git a/release.nix b/release.nix
index 9cf4c74f2..9202c2ff0 100644
--- a/release.nix
+++ b/release.nix
@@ -255,16 +255,6 @@ let
};
- #rpm_fedora27x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora27x86_64) [ ];
-
-
- #deb_debian8i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian8i386) [ "libsodium-dev" ] [ "libsodium13" ];
- #deb_debian8x86_64 = makeDeb_x86_64 (diskImageFunsFun: diskImageFunsFun.debian8x86_64) [ "libsodium-dev" ] [ "libsodium13" ];
-
- #deb_ubuntu1710i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1710i386) [ ] [ "libsodium18" ];
- #deb_ubuntu1710x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1710x86_64) [ ] [ "libsodium18" "libboost-context1.62.0" ];
-
-
# System tests.
tests.remoteBuilds = (import ./tests/remote-builds.nix rec {
inherit nixpkgs;
@@ -381,55 +371,4 @@ let
};
- makeRPM_i686 = makeRPM "i686-linux";
- makeRPM_x86_64 = makeRPM "x86_64-linux";
-
- makeRPM =
- system: diskImageFun: extraPackages:
-
- with import nixpkgs { inherit system; };
-
- releaseTools.rpmBuild rec {
- name = "nix-rpm";
- src = jobs.tarball;
- diskImage = (diskImageFun vmTools.diskImageFuns)
- { extraPackages =
- [ "sqlite" "sqlite-devel" "bzip2-devel" "libcurl-devel" "openssl-devel" "xz-devel" "libseccomp-devel" "libsodium-devel" "boost-devel" "bison" "flex" ]
- ++ extraPackages; };
- # At most 2047MB can be simulated in qemu-system-i386
- memSize = 2047;
- meta.schedulingPriority = 50;
- postRPMInstall = "cd /tmp/rpmout/BUILD/nix-* && make installcheck";
- #enableParallelBuilding = true;
- };
-
-
- makeDeb_i686 = makeDeb "i686-linux";
- makeDeb_x86_64 = makeDeb "x86_64-linux";
-
- makeDeb =
- system: diskImageFun: extraPackages: extraDebPackages:
-
- with import nixpkgs { inherit system; };
-
- releaseTools.debBuild {
- name = "nix-deb";
- src = jobs.tarball;
- diskImage = (diskImageFun vmTools.diskImageFuns)
- { extraPackages =
- [ "libsqlite3-dev" "libbz2-dev" "libcurl-dev" "libcurl3-nss" "libssl-dev" "liblzma-dev" "libseccomp-dev" "libsodium-dev" "libboost-all-dev" ]
- ++ extraPackages; };
- memSize = 2047;
- meta.schedulingPriority = 50;
- postInstall = "make installcheck";
- configureFlags = "--sysconfdir=/etc";
- debRequires =
- [ "curl" "libsqlite3-0" "libbz2-1.0" "bzip2" "xz-utils" "libssl1.0.0" "liblzma5" "libseccomp2" ]
- ++ extraDebPackages;
- debMaintainer = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
- doInstallCheck = true;
- #enableParallelBuilding = true;
- };
-
-
in jobs