Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f0445db9b4dd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b37872d42681
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 18, 2018

  1. foundationdb: set RELEASE=true for official builds

    This ensures the proper version is reported in the server status
    information; otherwise it has a '-PRERELEASE' suffix.
    
    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    (cherry picked from commit 47b3086)
    thoughtpolice committed Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b37872d View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 pkgs/servers/foundationdb/default.nix
5 changes: 4 additions & 1 deletion pkgs/servers/foundationdb/default.nix
Original file line number Diff line number Diff line change
@@ -37,6 +37,9 @@ let
# in theory newer versions of fdb support newer boost versions, but they
# don't :( maybe one day
, boost ? boost152

# if an release is unofficial/a prerelease, then make sure this is set
, officialRelease ? true
}: stdenv.mkDerivation rec {
name = "foundationdb-${version}";
inherit version;
@@ -109,7 +112,7 @@ let
# Needed environment overrides
++ [ "KVRELEASE=1"
"NOSTRIP=1"
];
] ++ lib.optional officialRelease [ "RELEASE=true" ];

# on 6.0 and later, we can specify all this information manually
configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") ''