Commit graph

39296 commits

Author SHA1 Message Date
Vladimír Čunát
9a86ad2f7f xorg.xkeyboard-config: commit forgotten fixups
Without these there was also a mysterious collision in nixos etc generation.
2014-02-16 11:25:49 +01:00
Vladimír Čunát
dfdf164f87 Merge master into x-updates
Conflicts (trivial):
	pkgs/games/spring/default.nix
2014-02-10 19:15:58 +01:00
Vladimír Čunát
74c34763e7 gdk_pixbuf: bugfix update 2.30.3 -> .4 2014-02-10 19:08:42 +01:00
Vladimír Čunát
159144c1e9 libpng(_apng): maintenance update 1.6.8 -> .9 2014-02-10 19:01:37 +01:00
Vladimír Čunát
3269027235 thunderbird: simple esr bump (Nov 2013), incl. CVE
I failed to make -26 build, so this will get security fixes at least.
2014-02-10 18:40:18 +01:00
Rob Vermaas
e9a894a97d Revert "Update hipchat"
This reverts commit 54288f5cfe.
2014-02-10 17:34:35 +01:00
Cillian de Róiste
00b1461e4f ATI-driver: the hash has changed, reported by: @ikervagyok 2014-02-10 16:42:02 +01:00
Shea Levy
80cc2697b1 user-groups: Sidestep all password escaping issues
Now passwords are written to a file first
2014-02-10 10:12:34 -05:00
Thomas Tuegel
3dc6168b31 Properly escape passwords sent to chpasswd
The mutableUsers feature uses `chpasswd` to set users passwords.
Passwords and their hashes were being piped into the program using
double quotes ("") to escape. This causes any `$` characters to be
expanded as shell variables. This is a serious problem because all the
password hash methods besides DES use multiple `$` in the hashes. Single
quotes ('') should be used instead to prevent shell variable expansion.
2014-02-10 08:16:22 -06:00
Shea Levy
6a8cc9ab11 mediawiki: Fix some references to /bin/bash 2014-02-10 09:14:30 -05:00
Shea Levy
42df6fcee9 mediawiki: Run update script after initializing the database 2014-02-10 08:56:16 -05:00
Domen Kožar
e5017d8239 springlobby: add unitsync patch 2014-02-10 14:21:42 +01:00
Domen Kožar
e5124e7a0e springlobby: specify spring run-time dependency paths 2014-02-10 14:19:57 +01:00
Peter Simons
e37afbf53c Merge pull request #1712 from PkmX/pr-taffybar
Add haskell packages 'gtk-traymanager' and 'taffybar'
2014-02-10 10:53:08 +01:00
Peter Simons
cc8c7f61da Merge pull request #1715 from ocharles/haskellPackages.jsonAssertions
haskellPackages.jsonAssertions: New expression
2014-02-10 10:52:37 +01:00
Peter Simons
1c5647c817 Merge pull request #1716 from ocharles/haskellPackages.diff3
haskellPackages.diff3: New expression
2014-02-10 10:52:11 +01:00
Domen Kožar
8e9f61995e spring: don't pass glibc 2014-02-10 09:41:30 +01:00
Domen Kožar
0f79534aa7 spring: use wrapper to set gcc lib path 2014-02-09 23:53:11 +01:00
Shea Levy
258c7536be Force a rebuild 2014-02-09 11:59:02 -05:00
Shea Levy
56b87f44ec Merge branch 'master' of git://github.com/ashalkhakov/nixpkgs
Bumping ATS/Postiats version to 0.0.5. #1719
2014-02-09 10:48:46 -05:00
Artyom Shalkhakov
52e99bc723 Bumping ATS/Postiats version to 0.0.5. 2014-02-09 16:26:46 +01:00
Tomasz Kontusz
fe38031168 Upgrade bumblebee and add nixos module
* Bump bumblebee to 3.2.1
 * Remove config.patch - options it added can be passed to ./configure now
 * Remove the provided xorg.conf
   Provided xorg.conf was causing problems for some users,
   and Bumblebee provides its own default configuration anyway.
 * Make secondary X11 log to /var/log/X.bumblebee.log
 * Add a module for bumblebee
2014-02-09 15:09:41 +01:00
Bjørn Forsman
48851fa749 nixos/memtest: use docbook formatting
Without this the HTML manual and manpage is quite unreadable (newlines
are squashed so it doesn't look like a list anymore).

(Unfortunately, this makes the source unreadable.)
2014-02-09 13:56:09 +01:00
Ricardo M. Correia
cba2444d11 nixos/memtest: Allow user to specify memtest86 boot parameters 2014-02-09 13:55:37 +01:00
Oliver Charles
cf5513f240 haskellPackages.diff3: New expression 2014-02-09 12:27:41 +00:00
Oliver Charles
de6222577a haskellPackages.jsonAssertions: New expression 2014-02-09 12:26:39 +00:00
Moritz Ulrich
c3df9e21c0 Weechat: Update to 0.4.3 2014-02-09 12:42:26 +01:00
Linquize
5b41db9765 git: update to 1.8.5.4 (close #1714) 2014-02-09 10:06:22 +01:00
PkmX
807d01debd Add Haskell package 'gtk-traymanager' 2014-02-09 06:24:22 +08:00
PkmX
3f30c971c8 Add haskell package 'taffybar' 2014-02-09 06:24:22 +08:00
Domen Kožar
b95b70c7a6 firefox: whitespace change to trigger a rebuild 2014-02-08 23:05:57 +01:00
Moritz Ulrich
18a03d7285 Leiningen: Update to 2.3.4 2014-02-08 21:48:50 +01:00
Domen Kožar
028379be28 nixos: add most basic gnome3 test and take a screenshot 2014-02-08 21:47:39 +01:00
Domen Kožar
9c95b1151a Merge pull request #1705 from wkennington/master.mumble
Upgrade murmur + mumble to 1.2.5
2014-02-08 21:22:50 +01:00
Shea Levy
84a7a09bc8 Try to improve naming of list elements in loaOf types
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-08 15:20:25 -05:00
Domen Kožar
ee14f8da9a remove references to isSystemUser and fix eval of tested job 2014-02-08 21:10:00 +01:00
Shea Levy
dea562b6b9 services.mesa -> hardware.opengl
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-08 14:45:37 -05:00
Domen Kožar
4a1e74673a pypy: support only linux for now 2014-02-08 20:27:57 +01:00
Domen Kožar
a23b87a13a pypy: disable a test with transient error #1634 2014-02-08 20:26:23 +01:00
Domen Kožar
b17edbac57 ModemManager: 0.5.4.0 -> 0.7.991 2014-02-08 20:17:00 +01:00
Domen Kožar
61f20ca45e libqmi: 1.0 -> 1.8.0, move outside gnome3 namespace, fix build 2014-02-08 20:17:00 +01:00
Moritz Ulrich
bb66a3ff6c Anki: Update to 2.0.22. 2014-02-08 19:19:50 +01:00
Moritz Ulrich
c983d23e33 elixir: Update to 0.12.3. 2014-02-08 19:05:31 +01:00
Moritz Ulrich
93f45ad2e5 Rebar: update to 2.2.0 2014-02-08 18:54:34 +01:00
Domen Kožar
4baa1197dd spring: add missing function parameters 2014-02-08 18:16:28 +01:00
Domen Kožar
64a8ae3692 SpringRTS: fix runtime dependencies and maintain 2014-02-08 18:11:59 +01:00
Vladimír Čunát
94ae555c06 Merge #1654: grsecurity: fix build and update 2014-02-08 17:46:27 +01:00
Vladimír Čunát
e78351cf3a llvm: revert to _33 default on darwin as a temp workaround
_34 doesn't build and I don't have a clue what to do about it
(and I don't have a machine to test it anyway).
2014-02-08 17:24:17 +01:00
Ricardo M. Correia
979473a17b chromium: Update stable channel from 32.0.1700.102 -> 32.0.1700.107 2014-02-08 15:40:25 +00:00
Ricardo M. Correia
b31547654d grsecurity: Update stable and test patches
stable: 3.0-3.2.54-201401191012 -> 3.0-3.2.54-201402062221
test:   3.0-3.12.8-201401191015 -> 3.0-3.13.2-201402062224
2014-02-08 16:16:58 +01:00