Ryan Mulligan
40b661a850
minecraft: use icon in jar
...
This removes the dependency on a wiki image download, which seemed bad
when I first introduced it. Unfortunately, they do not provide a 48x48
icon so we are not satisfying the minimal XDG standard.
2016-06-10 07:16:36 -07:00
Vladimír Čunát
20c2ce4954
Merge #16045 : kernel: 4.6.0 -> 4.6.1
2016-06-09 14:37:32 +02:00
Vladimír Čunát
c0895be3ee
Merge #16044 : kernel: 4.1.20 -> 4.1.25
2016-06-09 14:36:31 +02:00
Vladimír Čunát
f9310c2eee
Merge #16043 : kernel: 4.4.11 -> 4.4.12
2016-06-09 14:34:50 +02:00
Joachim Fasting
e52194f17d
Merge pull request #16061 from vrthra/io
...
io: 2013.12.04 -> 2015.11.11
2016-06-09 14:15:55 +02:00
Vladimír Čunát
cbca34b1a7
Merge #13977 : ffmpeg: add 3.0 version
...
I made the default not change for now.
2016-06-09 14:11:30 +02:00
Joachim Fasting
35f177fcc9
Merge pull request #15951 from nfjinjing/shadowsocks-libev
...
shadowsocks-libev: 2.4.6 -> 2.4.7
2016-06-09 14:10:18 +02:00
Vladimír Čunát
9bf6114147
ffmpeg: use 2 as the default for now
2016-06-09 14:07:39 +02:00
Vladimír Čunát
9876769698
ffmpeg_3: 3.0 -> 3.0.2
2016-06-09 14:06:18 +02:00
Joachim Fasting
376ba5f17f
dnscrypt-proxy service: update resolver list
2016-06-09 14:03:40 +02:00
Joachim Fasting
687fff86c1
Merge pull request #16087 from romildo/upd.enlightenment
...
enlightenment: 0.20.8 -> 0.20.9
2016-06-09 14:01:56 +02:00
Joachim Fasting
7a29c403fd
Merge pull request #16046 from NeQuissimus/kernel456
...
kernel: 4.5.5 -> 4.5.6
2016-06-09 13:56:13 +02:00
Joachim Fasting
b9428a4576
Merge pull request #16089 from vrthra/factor
...
factor: disable build on i686-linux
2016-06-09 13:55:06 +02:00
Rahul Gopinath
35c544e6d4
factor: disable build on i686-linux
...
The factor language should be built only on x86_64 machines.
2016-06-09 04:19:00 -07:00
Rahul Gopinath
c860de987d
io: 2013.12.04 -> 2015.11.11
...
Updating IO language to latest version
2016-06-09 04:15:26 -07:00
obadz
31f4a9b559
xfce.thunar: patch to avoid error
...
«the desktop file … is in an insecure location»
which pops up when invoking desktop files that are
symlinks to the /nix/store
this error was added by this commit:
1ec8ff89ec
«Only allow direct execution of desktop files in an
XDG directory and if they are executable.»
2016-06-09 12:10:15 +01:00
José Romildo Malaquias
3b28b5673b
enlightenment: 0.20.8 -> 0.20.9
2016-06-09 08:05:14 -03:00
Vladimír Čunát
cc174b3d55
pidgin: simplify using the wrapped version
...
Now only the `pidgin` attribute is exposed and it's wrapped based on
whether the `plugins` parameter is overridden.
Discussion: https://github.com/NixOS/nixpkgs/issues/8999#issuecomment-224851642
2016-06-09 12:21:36 +02:00
Peter Simons
dc6f1cf4b3
Merge pull request #16080 from mstarzyk/timezone-series
...
haskellPackages.timezone-series: Add support for time-1.6 - applied p…
2016-06-09 12:09:12 +02:00
Eelco Dolstra
109096247a
php56: update to 5.6.22
...
(cherry picked from commit 72b4009367257c2447aac89d5f34f2421bbc88dc)
2016-06-09 10:04:39 +00:00
Rushmore Mushambi
3871831b37
Merge pull request #16059 from vrthra/factor
...
factor-lang: Init at 0.97
2016-06-09 11:24:53 +02:00
obadz
fcb0023e80
haskellPackages.intero: fix tests (thanks @rvl)
2016-06-09 08:53:47 +01:00
Rahul Gopinath
51a7260fba
factor-lang: Init at 0.98
...
Factor is a concatenative, stack-based programming language.
2016-06-08 21:45:43 -07:00
Tuomas Tynkkynen
a357edc0c6
Merge pull request #16013 from nicknovitski/typespeed-darwin
...
typespeed: fix darwin compatibility
2016-06-09 05:24:57 +03:00
Nick Novitski
487140e8ef
typespeed: fix darwin compatibility
2016-06-09 02:07:40 +00:00
Jinjing Wang
4bc528ce28
shadowsocks-libev: 2.4.6 -> 2.4.7
2016-06-09 09:51:07 +08:00
Rushmore Mushambi
37ab0f3123
Merge pull request #16073 from rushmorem/package-nomad
...
nomad: add package
2016-06-09 01:44:47 +02:00
rushmorem
a2612dc0f1
nomad: add package
2016-06-09 01:27:32 +02:00
obadz
e3358c1951
pcmanfm-qt: init at 0.11.0
2016-06-08 23:08:15 +01:00
Maciek Starzyk
0158d124bd
haskellPackages.timezone-series: Download patch instead of checking it into nixpkgs
2016-06-09 00:03:41 +02:00
Maciek Starzyk
10c87e69b4
haskellPackages.timezone-series: Add support for time-1.6 - applied patch https://github.com/ygale/timezone-series/pull/1
2016-06-08 23:35:44 +02:00
Thomas Tuegel
bdb8bafd1f
Merge branch 'plasma-workspace'
2016-06-08 14:59:21 -05:00
Thomas Tuegel
8dae2eddcf
kde5.kdeplasma-addons: add missing ksysguard dependency
2016-06-08 14:58:35 -05:00
Thomas Tuegel
b214c6b64f
kde5.plasma-desktop: add missing ksysguard dependency
2016-06-08 13:51:25 -05:00
Benno Fünfstück
ba09675232
zap: update 2.4.3 -> 2.5.0
2016-06-08 20:21:39 +02:00
obadz
d13378ffd1
haskellPackages.libmpd: remove upper bound on time
2016-06-08 19:14:27 +01:00
Tobias Geerinckx-Rice
1201cc569c
geolite-legacy: 2016-06-06 -> 2016-06-08
2016-06-08 19:53:48 +02:00
Rushmore Mushambi
5c8a8808ba
Merge pull request #16056 from ljli/fix-atom
...
atom: patchelf ctags binary
2016-06-08 18:57:50 +02:00
Luis Pedro Coelho
bd617cb185
init bwa at 0.7.15
...
Closes #16064
2016-06-08 17:25:20 +01:00
obadz
ab70ae2edf
Merge pull request #15647 from layus/auctex
...
ktikz: init at 0.10
2016-06-08 17:17:50 +01:00
Christian Lask
093c42161f
yabar: init at 0.4.0
...
Closes #15945
2016-06-08 16:59:29 +01:00
Stefan Junker
2e6b257edf
rkt: 1.5.1 -> 1.7.0 ( #15958 )
2016-06-08 16:43:42 +01:00
vbgl
0a4e806f8f
ocamlnet: 3.7.7 -> 4.1.1 ( #16008 )
2016-06-08 16:40:08 +01:00
zimbatm
d220132f22
httpie: 0.9.2 -> 0.9.3 ( #16067 )
2016-06-08 16:38:08 +01:00
Thomas Tuegel
719b8e6d4c
Merge branch 'plasma-workspace-iso-codes'
2016-06-08 10:27:08 -05:00
Thomas Tuegel
bcd6e295d7
kde5.plasma-workspace: add iso-codes dependency
...
Fixes #16040 . CMake finds the iso-codes dependency through pkgconfig.
2016-06-08 10:26:24 -05:00
Joachim Fasting
ccf7048307
Merge pull request #16057 from taku0/firefox-bin-47.0
...
firefox-bin: 46.0.1 -> 47.0
2016-06-08 17:20:24 +02:00
Michael Raskin
d88aa14c6e
Firefox: 46.0.1 -> 47.0
2016-06-08 17:09:12 +02:00
Joachim Fasting
8fc6ca75a9
torbrowser: 6.0 -> 6.0.1
2016-06-08 16:51:53 +02:00
zimbatm
4e30ff7368
Merge pull request #16062 from vbgl/piqi-0.7.5
...
piqi-ocaml: 0.7.4 -> 0.7.5
2016-06-08 13:45:17 +01:00