Shea Levy
8b9b9fad31
Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""
...
Revert a revert of a merge that shouldn't have been in master but was intentionally in staging.
Next time I'll do this right after the revert instead of so far down the line...
This reverts commit 9adad8612b
.
2016-08-24 07:35:30 -04:00
obadz
78b7529ee3
Merge branch 'master' into staging
2016-08-24 11:57:44 +01:00
zimbatm
4d4980d9f8
Merge pull request #17805 from avnik/update/golang-1.7
...
go: add 1.7 compiler
2016-08-24 11:28:25 +01:00
Daniel Peebles
3f337a2b23
Merge pull request #17685 from matthewbauer/darwin-misc2
...
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
obadz
8da8aa7ddb
Merge branch 'hardened-stdenv' into staging
2016-08-23 18:50:10 +01:00
obadz
0e8d2725dc
Merge branch 'master' into staging
2016-08-23 18:50:06 +01:00
Robin Gloster
7413278f9b
Revert "Remove lsh, broken & unmaintained"
...
This reverts commit 73f4c2bdf8
.
2016-08-23 15:32:41 +00:00
Robin Gloster
3a18f06eab
Revert "lsh: remove last references"
...
This reverts commit 8329066d5e
.
2016-08-23 15:31:33 +00:00
Joachim F
56bfc0240e
Merge pull request #17766 from NeQuissimus/gradle30
...
gradle: 2.14.1 -> 3.0, keep 2.14.1
2016-08-23 16:22:05 +02:00
Lluís Batlle i Rossell
9ef3a51379
Adding vlc plugin for firefox.
...
I really wanted it to substitute the html5 player, or at least the direct
player for mp4/webm files in firefox, but I couldn't make it work. The
formats recognized by the firefox internal player were used in all cases. The
plugin worked for formats unknown by firefox.
https://support.mozilla.org/ca/questions/1089501
Nevertheless, as I wrote the nix recipe, I commit it. It may be of interest to
someone else.
2016-08-23 10:16:37 +02:00
Tuomas Tynkkynen
6d68178693
treewide: Make explicit that 'dev' output of imagemagick is used
2016-08-23 03:52:06 +03:00
Bjørn Forsman
abc43b0545
cifs-utils: align attrname with pkgname
...
Keep backwards compat alias.
2016-08-22 17:20:28 +02:00
Eelco Dolstra
5db200e839
jre: Set valid value for meta.outputsToInstall
...
Fixes #17866 .
2016-08-22 17:04:22 +02:00
Nikolay Amiantov
7bf7f19765
SDL2: cleanup and add patch to discover extensions
2016-08-22 06:30:01 +03:00
Nikolay Amiantov
b47327ebd5
SDL: cleanup and add patch to discover extensions
2016-08-22 06:30:00 +03:00
Nikolay Amiantov
18d7366418
openal: fix alias
2016-08-22 04:14:49 +03:00
obadz
24a9183f90
Merge branch 'hardened-stdenv' into staging
...
Closes #12895
Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
obadz
ba50fd7170
Merge branch 'master' into staging
2016-08-22 01:18:11 +01:00
Bjørn Forsman
ae567cda11
owncloud-client: align attrname with pkgname
...
Also, it seems the official binary distributions of the owncloud client
for the various Linux distros all use the dashed name [1]. Add backwards
compat alias for the old name.
[1] https://owncloud.org/install/#install-clients
2016-08-21 21:55:33 +02:00
Domen Kožar
76dca3d0e0
Merge pull request #17837 from MostAwesomeDude/fossil
...
build-support: Add fetchfossil function.
2016-08-21 21:47:00 +02:00
Luca Bruno
4916c11ec2
Merge pull request #17898 from RamKromberg/fix/vala_namespace
...
remove vala namespace
2016-08-21 20:31:44 +01:00
Joachim F
b374239e20
Merge pull request #17874 from acowley/with
...
with: init at 0.0.1
2016-08-21 20:57:08 +02:00
Alexander V. Nikolaev
800775e221
go: add 1.7 compiler
2016-08-21 21:20:07 +03:00
Ram Kromberg
cfe27ddf90
vala: remove default vala namespace
2016-08-21 20:21:53 +03:00
Ram Kromberg
98b087e413
font-manager: vala -> vala_0_32
2016-08-21 20:02:06 +03:00
Ram Kromberg
49bd29ae57
vanubi: vala -> vala_0_26
2016-08-21 20:02:05 +03:00
Ram Kromberg
a57cd70a11
pdfpc: vala -> vala_0_26
2016-08-21 20:02:05 +03:00
Ram Kromberg
672cf9455d
valum: vala -> vala_0_28
2016-08-21 20:02:05 +03:00
Ram Kromberg
2acfb62caa
shotwell: vala -> vala_0_28
2016-08-21 20:02:04 +03:00
Ram Kromberg
aa163eb8d8
vala: default.nix -> 0.23.nix & add vala_0_23
2016-08-21 20:02:04 +03:00
Luca Bruno
cccdbf0bfd
crunch: init at 3.6
2016-08-21 17:58:56 +01:00
obadz
68936edfb3
Merge branch 'master' into staging
2016-08-21 12:03:41 +01:00
Rickard Nilsson
7a3260c590
libvirt and pythonPackages.libvirt: 2.0.0 -> 2.1.0
2016-08-21 09:51:24 +02:00
Michael Raskin
a28ca06298
ao: init at 0.0pre20160820
2016-08-21 00:55:49 +02:00
Michael Raskin
3581a00d69
torch: init at 0.0-pre20160820
2016-08-20 23:41:34 +02:00
Anthony Cowley
30f8a050ae
with: init at 2016-08-20
...
Adds the "with" shell helper application.
2016-08-20 17:09:56 -04:00
Domen Kožar
2e9a3c3636
Merge pull request #17673 from k0001/fix-16074
...
Fix perl package CatalystXScriptServerStarman (and indirectly, hydra)
2016-08-20 19:36:02 +02:00
Robert Helgesson
2095c5947d
perl-DateTime-Format-SQLite: add meta section
2016-08-20 18:29:38 +02:00
Robert Helgesson
306083f7d2
perl-Sub-Name: 0.15 -> 0.19
2016-08-20 18:23:51 +02:00
Vladimír Čunát
d515cd8cdd
Merge #17868 : treewide: switch sourceforge to mirror://
2016-08-20 18:10:55 +02:00
Vladimír Čunát
cdb44a4ada
Merge branch 'master' into staging
2016-08-20 18:01:36 +02:00
Joachim Schiele
af15e057f4
leaps v0.5.0 init
2016-08-20 16:03:14 +02:00
J Phani Mahesh
dda6c4d5f4
python:cgkit: switch sf downloads to mirror://
...
This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
2016-08-20 19:14:29 +05:30
Joachim Fasting
ba0f9cfa49
Revert "Merge pull request #16980 from phanimahesh/sf-use-mirrors"
...
This reverts commit 217594fd1d
, reversing
changes made to 8e8a89d8a8
.
Turns out it wasn't ready afterall ...
2016-08-20 15:14:23 +02:00
Joachim F
217594fd1d
Merge pull request #16980 from phanimahesh/sf-use-mirrors
...
Cleanup of sourceforge download links
2016-08-20 14:58:55 +02:00
J Phani Mahesh
78714df165
python:cgkit: switch sf downloads to mirror://
...
This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
2016-08-20 17:19:56 +05:30
Joachim F
8e8a89d8a8
Merge pull request #17775 from juliendehos/wt
...
wt: init at 3.3.6
2016-08-20 13:02:51 +02:00
Josef Kemetmueller
b954322b0f
cxx-prettyprint: init at 2016-04-30
2016-08-20 10:19:40 +02:00
Nikolay Amiantov
826c398318
pythonPackages.scfbuild: remove workaround
2016-08-20 00:42:49 +03:00
Nikolay Amiantov
837cf416ce
wrapPythonProgram: exclude Python itself from PYTHONPATH
2016-08-20 00:42:49 +03:00