diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-02-21T13·26+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-02-21T13·26+0100 |
| commit | bb6656b8a259f2ad0f90536ee32bc3080e466f1a (patch) | |
| tree | 2769a9893d5f0a1d09330224fcda8bd65dd546ad | |
| parent | 99bbddedb1e70fc885e05cb398d8bfb438b039ed (diff) | |
Build RPMs for Fedora 25
Disabled hardened build because it makes the linker fail with messages like relocation R_X86_64_PC32 against undefined symbol `BZ2_bzWriteOpen' can not be used when making a shared object; recompile with -fPIC See https://fedoraproject.org/wiki/Changes/Harden_All_Packages.
| -rw-r--r-- | nix.spec.in | 2 | ||||
| -rw-r--r-- | release.nix | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nix.spec.in b/nix.spec.in index 401a2dc8a1f9..2447f13a8f84 100644 --- a/nix.spec.in +++ b/nix.spec.in @@ -1,3 +1,5 @@ +%undefine _hardened_build + %global nixbld_user "nix-builder-" %global nixbld_group "nixbld" diff --git a/release.nix b/release.nix index ace0f9cc89a2..8d71cc841c75 100644 --- a/release.nix +++ b/release.nix @@ -171,8 +171,8 @@ let }; - rpm_fedora21i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora21i386) [ "libsodium-devel" ]; - rpm_fedora21x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora21x86_64) [ "libsodium-devel" ]; + rpm_fedora25i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora25i386) [ "libsodium-devel" ]; + rpm_fedora25x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora25x86_64) [ "libsodium-devel" ]; deb_debian8i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian8i386) [ "libsodium-dev" ] [ "libsodium13" ]; @@ -256,8 +256,8 @@ let deb_debian8x86_64 deb_ubuntu1504i386 deb_ubuntu1504x86_64 - rpm_fedora21i386 - rpm_fedora21x86_64 + rpm_fedora25i386 + rpm_fedora25x86_64 tests.remoteBuilds tests.nix-copy-closure tests.binaryTarball |