Skip to content

Commit

Permalink
Fix dumb notation
Browse files Browse the repository at this point in the history
  • Loading branch information
svanderburg committed Dec 15, 2017
1 parent 73d9c5a commit bd3feac
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions lib/Package.js
Original file line number Diff line number Diff line change
Expand Up @@ -315,15 +315,15 @@ Package.prototype.toNixAST = function() {
}

var ast = this.source.toNixAST();
ast["dependencies"] = this.generateDependencyAST();
ast["buildInputs"] = new nijs.NixExpression("globalBuildInputs");
ast["meta"] = {
ast.dependencies = this.generateDependencyAST();
ast.buildInputs = new nijs.NixExpression("globalBuildInputs");
ast.meta = {
description: this.source.config.description,
homepage: homepage,
license: this.source.config.license
};
ast["production"] = this.production;
ast["bypassCache"] = this.deploymentConfig.bypassCache;
ast.production = this.production;
ast.bypassCache = this.deploymentConfig.bypassCache;

return ast;
};
Expand Down
2 changes: 1 addition & 1 deletion lib/sources/GitSource.js
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ GitSource.prototype.convertFromLockedDependency = function(dependencyObj, callba
GitSource.prototype.toNixAST = function() {
var ast = Source.prototype.toNixAST.call(this);

ast["src"] = new nijs.NixFunInvocation({
ast.src = new nijs.NixFunInvocation({
funExpr: new nijs.NixExpression("fetchgit"),
paramExpr: {
url: this.url,
Expand Down
2 changes: 1 addition & 1 deletion lib/sources/HTTPSource.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ HTTPSource.prototype.toNixAST = function() {
throw "Unknown hash type: "+this.hashType;
};

ast["src"] = new nijs.NixFunInvocation({
ast.src = new nijs.NixFunInvocation({
funExpr: new nijs.NixExpression("fetchurl"),
paramExpr: paramExpr
});
Expand Down
6 changes: 3 additions & 3 deletions lib/sources/LocalSource.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ LocalSource.prototype.toNixAST = function() {
var ast = Source.prototype.toNixAST.call(this);

if(this.srcPath === "./") {
ast["src"] = new nijs.NixFile({ value: "./." }); // ./ is not valid in the Nix expression language
ast.src = new nijs.NixFile({ value: "./." }); // ./ is not valid in the Nix expression language
} else if(this.srcPath === "..") {
ast["src"] = new nijs.NixFile({ value: "./.." }); // .. is not valid in the Nix expression language
ast.src = new nijs.NixFile({ value: "./.." }); // .. is not valid in the Nix expression language
} else {
ast["src"] = new nijs.NixFile({ value: this.srcPath });
ast.src = new nijs.NixFile({ value: this.srcPath });
}

return ast;
Expand Down
2 changes: 1 addition & 1 deletion lib/sources/NPMRegistrySource.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ NPMRegistrySource.prototype.toNixAST = function() {
break;
}

ast["src"] = new nijs.NixFunInvocation({
ast.src = new nijs.NixFunInvocation({
funExpr: new nijs.NixExpression("fetchurl"),
paramExpr: paramExpr
});
Expand Down

0 comments on commit bd3feac

Please sign in to comment.