Vladimír Čunát
0b192a0976
Merge branch 'master' into staging
...
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Robert Helgesson
b717faf49f
xml2: add platforms field
2016-05-22 14:34:05 +02:00
Vladimír Čunát
c4661e9643
Merge: make dev output references explicit
...
This is a rebase of most commits from #14766 ,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Tuomas Tynkkynen
8d473f107c
treewide: Make explicit that 'dev' output of readline is used
2016-05-19 10:03:35 +02:00
Tuomas Tynkkynen
3672f3edcb
treewide: Make explicit that 'dev' output of libxslt is used
2016-05-19 10:00:48 +02:00
Alexey Lebedeff
a4ecc91d39
platinum-searcher: init at 2.1.1
2016-05-18 19:24:10 +03:00
Domen Kožar
b49bf121b8
rename iElectric to domenkozar to match GitHub
2016-05-17 13:00:47 +01:00
Matthias Beyer
4d2914ff9e
sourceHighlight: 3.1.7 -> 3.1.8
2016-05-16 16:12:21 +02:00
Vladimír Čunát
1dc36904d8
Merge #14920 : windows improvements, mainly mingw
2016-05-05 08:30:19 +02:00
Vladimír Čunát
7a005601d4
Merge branch 'master' to resolve conflicts
2016-05-05 08:25:38 +02:00
Robin Gloster
9820cb1bf2
use dontBuild instead of hacks
...
changes:
* buildPhase = "true"
* buildPhase = ":"
2016-05-04 10:11:04 +00:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Tobias Geerinckx-Rice
be3d012da4
highlight: 3.18 -> 3.28
2016-05-03 04:33:49 +02:00
Lancelot SIX
df42fe1582
pkgs.gnugrep: 2.22 -> 2.25
...
All releases between 2.22 and 2.25 are all bugfix releases:
- 2.23: http://lists.gnu.org/archive/html/info-gnu/2016-02/msg00000.html
- 2.24: http://lists.gnu.org/archive/html/info-gnu/2016-03/msg00004.html
- 2.25: http://lists.gnu.org/archive/html/info-gnu/2016-04/msg00010.html
2016-04-28 19:38:54 +02:00
Tuomas Tynkkynen
b465dc202f
boost: Kill unnecessary 'lib' output
...
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Frederik Rietdijk
d5e6a4494a
Python: use PyPI mirror ( #15001 )
...
* mirrors: add pypi
* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Vladimír Čunát
7d7a9df360
html-tidy: fix on mingw
...
This doesn't fix the cross-build by itself due to
https://github.com/NixOS/nixpkgs/issues/14965
But in this case one can hack around that "easily" by:
(html-tidy.override {
inherit (/*non-cross nixpkgs eval*/)
cmake;
}).crossDrv
2016-04-25 10:09:15 +02:00
Vladimír Čunát
1c8ac52999
groff: now really fix build after --docdir fix
...
I forgot about some later changes around characters permitted in
$shareDocName.
2016-04-20 20:37:19 +02:00
Vladimír Čunát
60d6c5a92b
groff: fix build after --docdir fix
2016-04-20 16:38:42 +02:00
Joachim Fasting
36f7d498c9
unrtf: split man output
2016-04-15 17:41:41 +02:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Luca Bruno
04d4d0000f
namazu: mark as broken
2016-03-30 21:54:03 +02:00
Aneesh Agrawal
4fad4d49f6
icdiff: init at 1.7.3
2016-03-23 15:04:50 -04:00
joachifm
4f29a8c03e
Merge pull request #14023 from Adjective-Object/add/ansifilter
...
ansifilter: add @ 1.15
2016-03-22 00:44:49 +00:00
Maxwell
5c740539a8
ansifilter: init at 1.15
2016-03-21 09:42:32 -04:00
宋文武
93feb5d115
drop my maintainership ( close #13881 )
2016-03-13 18:39:01 +01:00
Joachim Fasting
5d2ed453b3
unrtf: move build deps to nativeBuildInputs
2016-03-12 19:06:56 +01:00
Wander Nauta
f70d678ec4
diction: init at 1.11
2016-03-08 11:53:39 +01:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Ozan Sener
3a6b06f1be
wring: init at 1.0.0
2016-02-28 18:05:56 +02:00
zimbatm
17348dc094
Remove all dots at end of descriptions
...
Specially crafted for @JagaJaga
find pkgs -name "*.nix" -exec \
sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Frederik Rietdijk
40ca841c5c
Merge pull request #13124 from FRidh/buildPythonApplication
...
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Pascal Wittmann
f1a65b3443
Merge pull request #13241 from zimbatm/gist-4.5.0
...
gist: 4.4.2 -> 4.5.0
2016-02-22 09:16:07 +01:00
zimbatm
17ad5ab0a9
gist: 4.4.2 -> 4.5.0
...
Fixes #13158
2016-02-21 18:43:34 +00:00
Frederik Rietdijk
4d06bf70f4
buildPythonApplication: use new function for Python applications
2016-02-19 13:16:41 +01:00
Nikolay Amiantov
199aeab96e
yaml-merge: init at 2016-02-16
2016-02-17 17:05:59 +03:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Eelco Dolstra
aea262f654
Fix misspelled meta.maintainers attributes
2016-02-10 14:59:50 +01:00
Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Badi' Abdul-Wahid
1cf106dd06
popfile: init at 1.1.3
...
Popfile by default assumes that it is run directly from the install
directory, in which it has full write access. This assumption is invalid
on Nix, and so Popfile is pachted to accomodate this:
- define `POPFILE_ROOT` in wrapper
Default POPFile configuration assumes it is running in the
installation directory. This patch wraps `popfile.pl` so that
`POPFILE_ROOT` points to the installation directory
- define and create if missing `POPFILE_USER` in wrapper
POPFile stores stores state in the `POPFILE_USER` directory, which by
default is the installation directory. This change sets `POPFILE_USER`
to `$HOME/.popfile` by default, creating it with 0700 mode if
necessary.
2016-02-01 19:59:03 -05:00
Tobias Geerinckx-Rice
9fb8020e4e
Add version attribute where maintainers |= nckx
...
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Robin Gloster
53b389327e
refactor to use autoreconfHook where possible
...
Close #12446 .
2016-01-18 10:45:31 +01:00
Vladimír Čunát
620c147cce
Merge branch 'master' into staging
2016-01-18 09:48:49 +01:00
Lluís Batlle i Rossell
4eb1e346c6
Improving the patch for mairix for mbox>2GB.
...
https://github.com/rc0/mairix/pull/19
2016-01-15 16:00:46 +01:00
Vladimír Čunát
2d0893088f
Merge branch 'master' into staging
2016-01-15 13:43:57 +01:00
Lluís Batlle i Rossell
6401bb1795
mairix: add fix (patch) for big files.
2016-01-14 17:38:57 +01:00
Eelco Dolstra
3fdf018f77
gnugrep: Disable tests
...
The test long-pattern-perf is timing sensitive, so it can fail
randomly based on load.
http://hydra.nixos.org/build/30265484
2016-01-12 12:06:41 +01:00
Arseniy Seroka
e126769a68
Merge pull request #12267 from zimbatm/dos2unix-7.3.2
...
dos2unix: 7.3 -> 7.3.2
2016-01-09 23:52:39 +03:00