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/nixos-search
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7f787939a1d6
Choose a base ref
...
head repository: NixOS/nixos-search
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3710d644b04e
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jun 18, 2020

  1. fix

    @garbas
    garbas committed Jun 18, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    picnoir Félix
    GPG key ID: EFD315F31848DBA4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3710d64 View commit details
Showing with 3 additions and 2 deletions.
  1. +2 −1 default.nix
  2. +1 −1 src/index.js
3 changes: 2 additions & 1 deletion default.nix
View file
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ pkgs.stdenv.mkDerivation {
buildPhase = ''
# Yarn writes cache directories etc to $HOME.
export HOME=$PWD/yarn_home
export ELASTICSEARCH_MAPPING_SCHEMA_VERSION=${version}
sed -i -e "s|process.env.ELASTICSEARCH_MAPPING_SCHEMA_VERSION|${version}|" src/index.js
yarn prod
'';

@@ -86,6 +86,7 @@ pkgs.stdenv.mkDerivation {
rm -rf node_modules
ln -sf ${yarnPkg}/libexec/${package.name}/node_modules .
export PATH=$PWD/node_modules/.bin:$PATH
export ELASTICSEARCH_MAPPING_SCHEMA_VERSION=${version}
echo "============================"
echo "= To develop run: yarn dev ="
echo "============================"
2 changes: 1 addition & 1 deletion src/index.js
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ const {Elm} = require('./Main');

Elm.Main.init({
flags: {
elasticsearchMappingSchemaVersion: process.env.ELASTICSEARCH_MAPPING_SCHEMA_VERSION || 6,
elasticsearchMappingSchemaVersion: process.env.ELASTICSEARCH_MAPPING_SCHEMA_VERSION || 0,
elasticsearchUrl: process.env.ELASTICSEARCH_URL || 'https://nixos-search-5886075189.us-east-1.bonsaisearch.net:443',
elasticsearchUsername : process.env.ELASTICSEARCH_USERNAME || 'z3ZFJ6y2mR',
elasticsearchPassword : process.env.ELASTICSEARCH_PASSWORD || 'ds8CEvALPf9pui7XG'