aszlig
3d665679c1
chromium: Properly implement mksnapshot target.
...
Let's ensure we do all architecture-dependant stuff inside
mkChromiumDerivation and not pass archInfo around, so we can properly
decouple it from the main function.
This partially reverts 8d54dc6d13
.
The main reason for doing this is because the architecture information
is no longer required in Chromium 37, so let's uglify and XXX it in
common.nix and remove it once version 37 hits the stable channel.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:34 +02:00
aszlig
1580688490
gyp: Update to new upstream revision 1944.
...
This is mainly needed in order to build the new Chromium version 37.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:33 +02:00
aszlig
3e64126344
nixos/shadow: Add an example for defaultUserShell.
...
Thanks to @devhell for the suggestion.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:33 +02:00
Austin Seipp
72a0bcd49f
Merge pull request #2957 from doublec/xpra
...
Change to xpra version 0.11.6 as 0.12.5 was not working
2014-06-18 16:25:44 -05:00
Austin Seipp
537dbfed78
Merge pull request #2898 from robberer/php/mssql
...
mssql support for php-5.4
2014-06-18 16:25:24 -05:00
Austin Seipp
b9fc9bd760
Merge pull request #2992 from bluescreen303/agda
...
Agda: upgrade stdlib to 0.8, change defaults to latest version
2014-06-18 16:22:33 -05:00
Austin Seipp
85c70f642f
Merge pull request #2977 from bluescreen303/emacs-org2blog
...
Emacs org2blog - bring up to date - now works with org-8.* again
2014-06-18 16:21:02 -05:00
Austin Seipp
1e3a53e44e
Merge pull request #3001 from deepfire/aurulent-sans
...
aurulent-sans: new expression
2014-06-18 16:20:18 -05:00
Austin Seipp
55fee4ffce
Merge pull request #3004 from offlinehacker/pkgs/logstash/update_1_3_3
...
logstash: update to 1.3.3
2014-06-18 16:20:00 -05:00
Austin Seipp
d349481e8b
Merge pull request #2960 from third3ye/patch-2
...
Application.ini does not refer correctly
2014-06-18 16:18:54 -05:00
Austin Seipp
ad0755e5d4
Merge pull request #2919 from ehmry/ogg-vorbis
...
libogg, libvorbis: update to 1.3.2, 1.3.4
2014-06-18 16:17:37 -05:00
Austin Seipp
15aee28fa1
Merge pull request #2990 from third3ye/patch-3
...
Minor logic fix
2014-06-18 16:16:58 -05:00
Austin Seipp
3a86ce32e4
Merge pull request #2937 from cpages/oxc
...
openxcom: add version 1.0.0
2014-06-18 16:16:07 -05:00
Austin Seipp
e5023b1f45
Merge pull request #2974 from bluescreen303/samba
...
samba really requires its daemons
2014-06-18 16:15:50 -05:00
Austin Seipp
4eb7fdcc13
Merge pull request #2966 from wkennington/master.sudo
...
Update and fix sudo
2014-06-18 16:13:53 -05:00
Austin Seipp
f72e9c1090
Merge pull request #2975 from bluescreen303/conkeror
...
conkeror: upgrade to latest snapshot
2014-06-18 16:09:52 -05:00
Austin Seipp
fb24267670
Merge pull request #3002 from tomberek/haskell_tcacheAWS
...
Adds tcache-AWS
2014-06-18 16:09:35 -05:00
Austin Seipp
ae8e54c64b
Merge pull request #2989 from pwoolcoc/git-cacert-path
...
add OPENSSL_X509_CERT_FILE to the `git` command environment
2014-06-18 16:09:22 -05:00
Austin Seipp
1e23c251e7
Merge pull request #2995 from pSub/dwb-update
...
Updated dwb to latest revision.
2014-06-18 16:08:52 -05:00
Austin Seipp
91f1dda340
Merge pull request #2980 from bluescreen303/php-fpm
...
phpfpm: add option for setting php.ini file
2014-06-18 16:08:21 -05:00
John Wiegley
4643126d10
Merge pull request #2938 from pSub/org-mode
...
Org-mode 8.2.7 depends on texlive-cm-super.
2014-06-18 09:42:12 -07:00
Jaka Hudoklin
d4506fd7eb
logstash: update to 1.3.3
2014-06-18 13:29:26 +02:00
Peter Simons
f7c7282964
Merge pull request #2979 from bluescreen303/idris
...
Idris: fix wrapper for llvm, upgrade emacs-idris-mode
2014-06-18 10:00:00 +02:00
Thomas Bereknyei
8a16a950ba
Adds tcache-AWS
2014-06-18 01:01:45 -04:00
William A. Kennington III
1bb2a094fd
sudo: Update 1.8.9p4 -> 1.8.10p3
2014-06-17 22:41:32 -05:00
William A. Kennington III
ef4ea24420
sudo: Always keepVisudo in order to simplify sudo build
2014-06-17 22:41:32 -05:00
Kosyrev Serge
4bbabdc8b9
aurulent-sans: new expression
2014-06-18 04:12:10 +04:00
Michael Raskin
8297a26746
Create an option to build 3.16-rc1 which carries a new Wireless driver; make USB_DEBUG optional as it seems to be planned to disappear in 3.16.
2014-06-18 00:23:48 +02:00
Austin Seipp
fd4c2d893f
duo-unix: upgrade, fix full name + version
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-17 17:06:31 -05:00
Austin Seipp
5cf3fb7cb6
arcanist: 20140606 -> 20140617
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-17 15:48:51 -05:00
Eelco Dolstra
e5d63646a0
Don't suggest using --arg config '{ allowUnfree = true; }'
...
This doesn't work when using the Nixpkgs/NixOS channel.
Issue #2998 .
2014-06-17 15:00:24 -05:00
Anders Claesson
97d65d8010
nixos manual: fix typo ( close #2997 )
2014-06-17 21:52:22 +02:00
Austin Seipp
7f800e8155
jd-gui: version 0.3.5
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-17 14:44:49 -05:00
William A. Kennington III
86711e4120
nixos-iso: Re-enable new kernel iso images ( close #2839 )
2014-06-17 21:23:52 +02:00
Wout Mertens
d619f0ef6d
sublime3: fix plugin_host ( close #2804 )
...
Also move the binaries in their own package, so it doesn't pollute the
profile.
2014-06-17 21:15:37 +02:00
Ricardo M. Correia
f8e108c865
nixos.tests.installer: Fix test failures due to network being disabled
2014-06-17 18:41:26 +02:00
Pascal Wittmann
41e5fd84c3
Updated dwb to latest revision.
2014-06-17 16:25:53 +02:00
Shea Levy
50287f2c02
Merge pull request #2991 from bluescreen303/kernel-3.15
...
linux-3.15: upgrade to 3.15.1
2014-06-17 09:59:23 -04:00
Shea Levy
fec288f404
Merge branch 's3cmd-git' of git://github.com/fmapfmapfmap/nixpkgs
2014-06-17 09:56:01 -04:00
lethalman
219e992519
Merge pull request #2976 from bluescreen303/nginx
...
nginx: fix group, statedir permissions, add echo module, fix aio
2014-06-17 14:23:15 +02:00
Mathijs Kwik
2d92adcc1a
agda: change defaults to latest version
2014-06-17 08:25:45 +02:00
Mathijs Kwik
3fd519822f
agda-stdlib: upgrade to 0.8 (they keep changing the version scheme)
...
Conflicts:
pkgs/development/compilers/agda/stdlib-0.8.nix
pkgs/top-level/haskell-packages.nix
2014-06-17 08:25:44 +02:00
Mathijs Kwik
5bc69209b1
linux-3.15: upgrade to 3.15.1
2014-06-17 08:17:38 +02:00
third3ye
9c83a6bc76
Minor logic fix
...
music_directory "${cfg.musicDirectory}"
playlist_directory "${cfg.dataDir}/playlists"
db_file "${cfg.dataDir}/tag_cache"
state_file "${cfg.dataDir}/state"
sticker_file "${cfg.dataDir}/sticker.sql"
all refer to ${cfg.datadir}, which by default is "/var/lib/mpd/".
Parsing for instance ${cfg.datadir}/playlists results in:
/var/lib/mpd//playlists - NOT FOUND.
2014-06-17 03:24:39 +00:00
Paul Woolcock
88b5578a57
add OPENSSL_X509_CERT_FILE to the git
command environment
2014-06-16 21:55:43 -04:00
John Wiegley
f39471a873
ncurses: apply a patch on Darwin for a clang bug
2014-06-16 16:39:20 -07:00
John Wiegley
6025caa92b
Merge pull request #2972 from proger/rsync-patch-hash
...
rsync: sha256 for the patch was updated
2014-06-16 15:42:44 -07:00
John Wiegley
195800e881
Do not use static-libgcc flag on Darwin
2014-06-16 14:26:40 -07:00
John Wiegley
61e8fe50c2
Agda: add 2.4.0.1, 2.3.2.2 is still the default for now
2014-06-16 14:03:17 -07:00
John Wiegley
39dfef4af0
haskell-boxes: new expression
2014-06-16 14:03:17 -07:00