Skip to content
This repository has been archived by the owner on Apr 9, 2023. It is now read-only.

Commit

Permalink
fix grunt helper script
Browse files Browse the repository at this point in the history
also:
 - update bower to 1.3.1
  • Loading branch information
garbas committed Mar 12, 2014
1 parent 75e35f9 commit 0bb6d63
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mockup-core",
"version": "1.1.0",
"version": "1.1.1",
"description": "Mockup Core",
"dependencies": {
"backbone": "1.1.2",
Expand Down
3 changes: 2 additions & 1 deletion default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ mockup-core ? { outPath = ./.; name = "mockup-core"; }
}:
let
version = '1.1.0';
pkgs = import <nixpkgs> {};
bowerPackages = import ./bower.nix { };
nodePackages = import <nixpkgs/pkgs/top-level/node-packages.nix> {
Expand All @@ -11,7 +12,7 @@ let
generated = ./package.nix;
};
in rec {
tarball = pkgs.runCommand "mockup-core-1.6.0.tgz" { buildInputs = [ pkgs.nodejs ]; } ''
tarball = pkgs.runCommand "mockup-core-${version}.tgz" { buildInputs = [ pkgs.nodejs ]; } ''
mv `HOME=$PWD npm pack ${mockup-core}` $out
'';
build = nodePackages.buildNodePackage {
Expand Down
4 changes: 3 additions & 1 deletion js/grunt.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
'use strict';

var extend = require('extend'),
karmaConfig = require('../node_modules/karma/lib/config'),
path = require('path'),
appDir = path.dirname(require.main.filename),
karmaConfig = require(appDir + '/../../../node_modules/karma/lib/config'),
MockupGrunt = function (requirejsOptions) { this.init(requirejsOptions); };

MockupGrunt.prototype = {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "mockup-core",
"version": "1.1.0",
"version": "1.1.1",
"description": "Plone CMS Mockup Core",
"homepage": "http://plone.github.io/mockup",
"devDependencies": {
"bower": "~1.3.0",
"bower": "~1.3.1",
"coveralls": "~2.8.0",
"extend": "~1.2.1",
"grunt": "~0.4.3",
Expand Down
16 changes: 8 additions & 8 deletions package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -577,15 +577,15 @@
];
passthru.names = [ "boom" ];
};
by-spec."bower"."~1.3.0" =
self.by-version."bower"."1.3.0";
by-version."bower"."1.3.0" = lib.makeOverridable self.buildNodePackage {
name = "bower-1.3.0";
by-spec."bower"."~1.3.1" =
self.by-version."bower"."1.3.1";
by-version."bower"."1.3.1" = lib.makeOverridable self.buildNodePackage {
name = "bower-1.3.1";
src = [
(fetchurl {
url = "http://registry.npmjs.org/bower/-/bower-1.3.0.tgz";
name = "bower-1.3.0.tgz";
sha1 = "d615ad16859b64c02e3f6b584d3e0d5f669f4063";
url = "http://registry.npmjs.org/bower/-/bower-1.3.1.tgz";
name = "bower-1.3.1.tgz";
sha1 = "60d564e774be4e60631a159566830fce260e469a";
})
];
buildInputs =
Expand Down Expand Up @@ -636,7 +636,7 @@
];
passthru.names = [ "bower" ];
};
"bower" = self.by-version."bower"."1.3.0";
"bower" = self.by-version."bower"."1.3.1";
by-spec."bower-config"."~0.4.3" =
self.by-version."bower-config"."0.4.5";
by-version."bower-config"."0.4.5" = lib.makeOverridable self.buildNodePackage {
Expand Down

0 comments on commit 0bb6d63

Please sign in to comment.