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: acb7f43db94f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c0d2ee13be98
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 16, 2017

  1. rambox: allow user to use other auth0 credentials

    gnidorah committed Nov 16, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a5b8823 View commit details

Commits on Nov 17, 2017

  1. Merge pull request #31730 from gnidorah/rambox 

    rambox: allow user to use other auth0 credentials
    @orivej
    orivej authored Nov 17, 2017
    Copy the full SHA
    c0d2ee1 View commit details
Showing with 10 additions and 9 deletions.
  1. +1 −7 pkgs/applications/networking/instant-messengers/rambox/bare.nix
  2. +9 −2 pkgs/applications/networking/instant-messengers/rambox/default.nix
8 changes: 1 addition & 7 deletions pkgs/applications/networking/instant-messengers/rambox/bare.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha }:
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha, auth0ClientID, auth0Domain }:

stdenv.mkDerivation rec {
name = "rambox-bare-${version}";
@@ -22,12 +22,6 @@ stdenv.mkDerivation rec {

patches = [ ./hide-check-for-updates.patch ./isDev.patch ];

# These credentials are only for this derivation. If you want to get credentials
# for another distribution, go to https://auth0.com. If you want to reuse the same
# domain, drop a line at yegortimoshenko@gmail.com!
auth0ClientID = "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU";
auth0Domain = "nixpkgs.auth0.com";

configurePhase = ''
echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
ln -s ${node_modules} node_modules
11 changes: 9 additions & 2 deletions pkgs/applications/networking/instant-messengers/rambox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem }:
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
# These credentials are only for this derivation. If you want to get credentials
# for another distribution, go to https://auth0.com. If you want to reuse the same
# domain, drop a line at yegortimoshenko@gmail.com!
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
, auth0Domain ? "nixpkgs.auth0.com" }:

let
callPackage = newScope self;
self = {
fetchNodeModules = callPackage ./fetchNodeModules.nix {};
rambox-bare = callPackage ./bare.nix {};
rambox-bare = callPackage ./bare.nix {
inherit auth0ClientID auth0Domain;
};
sencha = callPackage ./sencha {};
};
desktopItem = makeDesktopItem rec {