Wout Mertens
1f400ea463
Merge pull request #6411 from NixOS/passAsFile
...
writeTextFile: Use passAsFile if available
2015-05-14 13:57:24 +02:00
Domen Kožar
bb4d658f64
Merge branch 'master' into staging
...
Conflicts:
nixos/doc/manual/release-notes/rl-unstable.xml
nixos/modules/services/printing/cupsd.nix
pkgs/applications/misc/calibre/default.nix
pkgs/development/haskell-modules/hackage-packages.nix
pkgs/development/libraries/libsodium/default.nix
pkgs/misc/emulators/wine/unstable.nix
pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
William A. Kennington III
c3bdabca73
Merge pull request #7803 from codyopel/intltool
...
intltool: refactor
2015-05-11 00:35:06 -07:00
codyopel
4b07d16827
intltool: refactor
2015-05-11 03:11:30 -04:00
Pascal Wittmann
cf87977268
Merge pull request #7802 from codyopel/smtube
...
smtube: 15.1.0 -> 15.5.10
2015-05-11 08:58:28 +02:00
William A. Kennington III
5a117814b8
pam: 1.1.8 -> 1.2.0
2015-05-10 22:39:31 -07:00
William A. Kennington III
df3d2010ae
libinput: 0.14.1 -> 0.15.0
2015-05-10 22:35:05 -07:00
William A. Kennington III
f8caa8f940
vlc: 2.2.0 -> 2.2.1
2015-05-10 22:34:53 -07:00
codyopel
54de18c4aa
smtube: 15.1.0 -> 15.5.10
2015-05-11 01:19:24 -04:00
Charles Strahan
e3696ed37f
ghcjs: bump ghcjs-prim
...
closes #7768
2015-05-11 00:52:52 -04:00
William A. Kennington III
142b48688c
edac-utils: Add derivation
2015-05-10 18:18:31 -07:00
Shea Levy
d983875362
gcc-5: Fix build on darwin
2015-05-10 18:06:29 -07:00
Ricardo M. Correia
aa75bb25d8
grsecurity: Update stable and test patches
...
stable: 3.1-3.14.41-201505072056 -> 3.1-3.14.41-201505101121
test: 3.1-4.0.2-201505072057 -> 3.1-4.0.2-201505101122
2015-05-11 02:45:38 +02:00
Charles Strahan
7493d6f1f6
marathon: 0.8.0 -> 0.8.1
2015-05-10 19:56:46 -04:00
Arseniy Seroka
8462e9ec64
Merge pull request #7799 from listx/for-upstream
...
doc: language-support: fix typo
2015-05-11 02:53:07 +03:00
Charles Strahan
26cf4a6684
Merge pull request #7722 from cstrahan/mesos-0.22.0
...
mesos: 0.21.0 -> 0.22.0
2015-05-10 19:40:43 -04:00
Charles Strahan
ba186ec4b9
mesos service: only pass --zk if quorum > 0
...
The ZooKeeper URL is not necessary when using in-memory slave
registration.
2015-05-10 19:36:20 -04:00
Linus Arver
62ad22b8ae
doc: language-support: fix typo
2015-05-10 15:28:58 -07:00
Charles Strahan
760169663e
mesos: fix indentation in service definition
2015-05-10 17:23:33 -04:00
Charles Strahan
9d9e21c7fd
mesos: 0.21.0 -> 0.22.0
...
This also enables the network isolation feature that was introduced in
Mesos 0.20.0.
2015-05-10 17:23:20 -04:00
Tobias Geerinckx-Rice
029db1fdf4
Merge pull request #7401 from bendlas/geoip-database
...
geoip: Install geolite database by default
2015-05-10 22:20:44 +02:00
Peter Simons
eafd67b45e
haskell-wreq has been fixed upstream
2015-05-10 22:14:46 +02:00
Peter Simons
e9e07667b2
haskell-cryptol: override is no longer necessary
2015-05-10 22:14:46 +02:00
Peter Simons
c2c724bcaf
haskell-stm-queue-extras: override is no longer necessary
2015-05-10 22:14:46 +02:00
Peter Simons
7f76150662
haskell-call: build should be fixed, but the dependency audiovisual is still broken
2015-05-10 22:14:46 +02:00
Peter Simons
7b49289c74
hackage-packages.nix: update to 4f492cbdcc
with hackage2nix revision 4c63d4ad559c7c9569df1ea07557f92a1cfb5a3e
2015-05-10 22:14:42 +02:00
Jascha Geerds
19dbe42aeb
Revert "cups: Rename "browsing" config option to "advertise""
...
This reverts commit 48e65cec4e
.
2015-05-10 20:47:50 +02:00
Benno Fünfstück
2818017347
Merge pull request #7791 from vandenoever/elm
...
Fix compilation of language-glsl.
2015-05-10 19:02:30 +02:00
Jos van den Oever
d8b93eb1cd
Fix compilation of language-glsl.
...
The issue / patch https://github.com/noteed/language-glsl/pull/10 fixes
a compilation problem with language-glsl.
The packages pretty and prettyclass conflicted when compiled with GHC 7.10.
2015-05-10 18:50:07 +02:00
Arseniy Seroka
87b4f9286d
Merge pull request #7604 from bendlas/wine64
...
wine: add 64 bit build and module
2015-05-10 19:13:37 +03:00
Arseniy Seroka
f6016b9a7b
Merge pull request #7784 from seppeljordan/emulationstation
...
Update emulationstation 2.0.0.rc1 -> 2.0.1a
2015-05-10 19:07:46 +03:00
Stewart Mackenzie
8a82935d46
gnuradio-osmosdr: add hackrf support
2015-05-10 17:51:01 +02:00
Herwig Hochleitner
ae6d2796bc
wine: add 64 bit build and nixpkgs configuration
...
The default release channel (stable/unstable) and the default
build (wine32/wine64/wineWow) can be customized via the "wine" key in config
2015-05-10 15:45:01 +02:00
Domen Kožar
b7f15c43da
fix evals /cc @ttuegel
2015-05-10 13:46:32 +02:00
Domen Kožar
4f2b49744d
docker: fix build
2015-05-10 13:46:32 +02:00
Jascha Geerds
652d06207d
cups: Rename "browsing" config option to "advertise"
2015-05-10 13:46:32 +02:00
Jascha Geerds
c4c0ec0581
cups: Add changelog for the upcoming NixOS release
2015-05-10 13:46:32 +02:00
Jascha Geerds
6f69dd46d7
cups: Add defaultShared, browsing and webInterace config option
2015-05-10 13:46:32 +02:00
Jascha Geerds
65e2b83b36
cups: Fix printing tests
...
It seems like there's an upstream bug in the "lpstat" command. We need
to specify the server's port.
Further information: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711327
[root@client:~]# lpstat -H
/var/run/cups/cups.sock
[root@client:~]# lpstat -h server -H
/var/run/cups/cups.sock:631
[root@client:~]# CUPS_SERVER=server lpstat -H
server:631
[root@client:~]# lpstat -h server:631 -H
server:631
2015-05-10 13:46:32 +02:00
Jascha Geerds
f4d9c9043c
cups: Remove deprecated config options from cupsd.conf
2015-05-10 13:46:32 +02:00
Jascha Geerds
e9cf6cd34f
cups: Use systemd files provided by CUPS
2015-05-10 13:46:32 +02:00
Jascha Geerds
252bc4a4b9
cups: Add xdg_utils to build inputs
2015-05-10 13:46:32 +02:00
Jascha Geerds
b89bf5668a
cups: Refactor meta attributes
2015-05-10 13:46:32 +02:00
William A. Kennington III
862510079a
cups: 1.7.5 -> 2.0.2
2015-05-10 13:46:32 +02:00
Michael Raskin
de02c8e880
Update Pipelight to use wine-staging
2015-05-10 13:46:32 +02:00
Michael Raskin
a31b9e1816
Update Wine staging to match Wine unstable
2015-05-10 13:46:31 +02:00
Michael Raskin
ed38a2d32b
Explicitly pass -pthread flag to fix the build after some updates
2015-05-10 13:46:31 +02:00
Michael Raskin
ae3b88aae4
Update SBCL
2015-05-10 13:46:31 +02:00
Michael Raskin
6219db292c
Update LiquidWar
2015-05-10 13:46:31 +02:00
Michael Raskin
8a4630d9dd
Update Wine unstable
2015-05-10 13:46:31 +02:00