Shea Levy
c45372f038
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
...
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
William A. Kennington III
acbf8eb561
unifi: 3.2.7 -> 3.2.10
2015-02-02 18:03:23 -08:00
Sou Bunnbu
f2fe5df565
Merge pull request #6079 from wyvie/mudletversion
...
mudlet version
2015-02-03 09:26:22 +08:00
Kosyrev Serge
b9cc04329b
fix 404 URLs ( close #6105 )
2015-02-02 22:05:51 +01:00
Edward Tjörnhammar
f8038b0c6c
kodi: 14.0 -> 14.1, added myself as maintainer
2015-02-02 20:15:52 +01:00
aszlig
78bbd6f7c6
linux-testing: Update to version 3.19-rc7.
...
Running -rc6 always feels kinda rusty and old, so there is the pressing
urge to update... into the future... swooooooosh!
Signature verified against key with fingerprint:
ABAF 11C6 5A29 70B1 30AB E3C4 79BE 3E43 0041 1886
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-02 19:50:56 +01:00
Peter Simons
fefb81fb16
Merge pull request #6106 from arno01/owncloud
...
owncloud: update to 1.7.1
2015-02-02 18:38:01 +01:00
Andrey Arapov
7ed1435aa9
owncloud: update to 1.7.1
2015-02-02 18:28:55 +01:00
Vincent Laporte
7ee3e777c3
ocaml-zed: update from 1.3 to 1.4
2015-02-02 15:43:42 +01:00
Peter Simons
9d5bde2eed
Merge pull request #6099 from bflyblue/master
...
Updated monad-journal and scotty
2015-02-02 15:14:50 +01:00
wyvie
629357c04a
mudlet version
2015-02-02 16:50:39 +03:00
Shaun Sharples
a206ffc959
bump scotty to 0.9.1
2015-02-02 15:30:18 +02:00
Shaun Sharples
85b61347ae
bump monad-journal to 0.7
2015-02-02 15:29:58 +02:00
Peter Simons
9c3a0d6e1e
haskell-configuration-common.nix: clean up obsolete overrides
2015-02-02 14:13:22 +01:00
Peter Simons
cca1b01b02
haskell-uhc-light: won't succeed the Haddock stage
2015-02-02 14:13:22 +01:00
Peter Simons
4020b77062
haskell-configuration-common.nix: fix evaluation
2015-02-02 14:13:22 +01:00
Peter Simons
3f77afc2b9
haskell-monad-levels: doesn't build with GHC 7.8.4 because of transformers 0.4.x
2015-02-02 14:13:22 +01:00
Peter Simons
a0855b296c
haskell-ng: more test suite failures
2015-02-02 14:13:22 +01:00
Peter Simons
707f75ddab
haskell-duplo: test suite fails (although harmlessly)
2015-02-02 14:13:22 +01:00
Peter Simons
9a33055dc0
haskell-MoeDict is broken
2015-02-02 14:13:22 +01:00
Peter Simons
f87871d266
haskell-hub is broken
2015-02-02 14:13:22 +01:00
Peter Simons
280cf7f3e3
haskell-th-alpha is broken
2015-02-02 14:13:22 +01:00
Peter Simons
c24214185c
hackage-packages.nix: re-generate from Hackage 2015-02-02T11:13:36+0100
2015-02-02 14:13:22 +01:00
Nikolay Amiantov
8f95561b5f
Merge pull request #6098 from abbradar/pidgin-otr
...
pidgin-otr: adopt and add platforms
2015-02-02 14:03:49 +03:00
Nikolay Amiantov
28d9da7498
pidgin-otr: adopt and add platforms
2015-02-02 14:00:17 +03:00
Peter Simons
87c7fb24ed
Merge pull request #6027 from offlinehacker/pkgs/godep/add
...
Add godep, dependency tool for go
2015-02-02 11:42:03 +01:00
Peter Simons
928f255c30
haskell-readline: add missing (undeclared) dependencies in readline and ncurses
...
Fixes https://github.com/NixOS/nixpkgs/issues/6085 .
2015-02-02 11:10:50 +01:00
lethalman
ef87904b6a
Merge pull request #6094 from nckx/update-keyfinder-cli
...
Update keyfinder-cli 20150125 -> 20150130
2015-02-02 09:46:32 +01:00
Sou Bunnbu
7861c25eb0
Merge pull request #6093 from nckx/update-stress-ng
...
Update stress-ng 0.03.11 -> 0.03.13
2015-02-02 13:06:30 +08:00
Sou Bunnbu
3de305376a
Merge pull request #6095 from nckx/update-pgcli
...
Update pgcli 0.13.0 -> 0.14.0
2015-02-02 13:04:17 +08:00
Tobias Geerinckx-Rice
1fde266b48
Update keyfinder-cli 20150125 -> 20150130
2015-02-02 02:02:29 +01:00
Tobias Geerinckx-Rice
bf748c97e1
Update pgcli 0.13.0 -> 0.14.0
2015-02-02 02:00:19 +01:00
William A. Kennington III
4ddf8af525
zfs_git: Update
2015-02-01 16:00:10 -08:00
William A. Kennington III
c7268fb4bf
spl_git: Update
2015-02-01 16:00:03 -08:00
William A. Kennington III
12378faab2
kernel: 3.19-rc5 -> 3.19-rc6
2015-02-01 15:53:48 -08:00
Tobias Geerinckx-Rice
b7a4231be7
Update stress-ng 0.03.11 -> 0.03.13
2015-02-02 00:15:46 +01:00
Thomas Tuegel
0fee7a2b21
fontconfig: stringify dpi correctly
2015-02-01 16:18:48 -06:00
Michael Raskin
9b29267511
Oops, botched SBCL update, fixing source hash
2015-02-01 23:55:31 +03:00
Domen Kožar
931cdce276
Merge pull request #6088 from malyn/xss-lock
...
Add xss-lock
2015-02-01 20:30:43 +01:00
Michael Alyn Miller
6cb1d1aaaf
Add xss-lock
2015-02-01 10:07:01 -08:00
Mateusz Kowalczyk
212026e8f5
Merge pull request #6084 from devhell/mpv
...
mpv: 0.7.2 -> 0.7.3; waf: 1.8.1 -> 1.8.5
2015-02-01 18:04:54 +00:00
Thomas Tuegel
95829c8959
k3b: propagate cdrecord dependency
...
By default, k3b will use cdrkit, but that can be overriden by choosing
the original cdrtools.
2015-02-01 10:34:30 -06:00
Thomas Tuegel
76c396848d
Merge branch 'quassel'
...
Add Qt 5 versions of Quassel's client and daemon.
2015-02-01 10:33:09 -06:00
Thomas Tuegel
d9fce39cc4
quassel: add Qt 5 version of daemon
2015-02-01 10:32:27 -06:00
Thomas Tuegel
3d779db0ca
quassel: add Qt 5 version of client
2015-02-01 10:31:56 -06:00
Thomas Tuegel
2b933f31f6
kdeApps.kmix: remove Qt 4 dependencies
2015-02-01 10:26:55 -06:00
Michael Raskin
9e7afd50fb
Simplify update metadata for DirectFB
2015-02-01 18:43:13 +03:00
Michael Raskin
c6dfb67059
Fresh LibreOffice 4.4 at least starts to build
2015-02-01 18:41:33 +03:00
Michael Raskin
594f33bb17
Update SBCL
2015-02-01 18:41:33 +03:00
Michael Raskin
71797af73f
Update pipelight Wine
2015-02-01 18:41:33 +03:00
