Vladimír Čunát a558519a55 Revert "gnome3.gjs: 1.46 -> 1.47, use spidermonkey_31" ... This reverts commit bcfca9224f. It broke gnome-shell build and I can't see a quick way to fix it; cause: removal of gjs-internals-1.0.pc. Stable gnome-shell update didn't help.		2017-02-04 12:00:32 +01:00
..
applications	Merge branch 'master' into staging	2017-02-03 15:32:08 +01:00
build-support	Add a `pkgs.dhallToNix` utility	2017-01-26 20:11:49 -08:00
data	callHackage: update Hackage snapshot to a current version	2017-01-31 22:50:18 +01:00
desktops	Revert "gnome3.gjs: 1.46 -> 1.47, use spidermonkey_31"	2017-02-04 12:00:32 +01:00
development	Revert "spidermonkey_24: remove"	2017-02-04 11:53:23 +01:00
games	Merge branch 'master' into staging	2017-02-03 11:47:38 +01:00
misc	Merge branch 'master' into staging	2017-02-03 11:47:38 +01:00
os-specific	Merge branch 'master' into staging	2017-02-03 15:32:08 +01:00
servers	xorg.libXpm: 3.5.11 -> 3.5.12	2017-02-03 13:14:39 +01:00
shells	es: add ttuegel to maintainers	2017-01-31 07:54:36 -06:00
stdenv	~/.nixpkgs -> ~/.config/nixpkgs	2017-02-01 16:07:55 +01:00
test	…
tools	Merge branch 'master' into staging	2017-02-03 15:32:08 +01:00
top-level	Revert "spidermonkey_24: remove"	2017-02-04 11:53:23 +01:00