Robin Gloster
63c7b4f9a7
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-31 20:51:34 +00:00
mimadrid
83251cdd60
meld: 3.16.1 -> 3.16.2
2016-07-30 11:06:22 +02:00
mimadrid
59caf069a4
git: 2.9.1 -> 2.9.2
2016-07-29 11:28:31 +02:00
Bjørn Forsman
e7ef33c50a
git: fix gitweb.cgi breakage due to missing CGI.pm
...
CGI.pm was removed from Perl core in v5.22, breaking the gitweb.cgi
script and thus NixOS' services.lighttpd.gitweb. Nixpkgs switched to
Perl 5.22 with a85ba820a4
("perl: Make 5.22 the default").
Fix it by bringing in the Perl CGI module (and dependency HTMLParser).
The closure size of "nix-build -A git" increase by 1 MiB, to 201 MiB.
2016-07-26 15:20:24 +02:00
Robin Gloster
f222d98746
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-25 12:47:13 +00:00
Peter Simons
641fc0e683
haskell: remove all but the latest LTS package sets (version 6.7)
...
This is the first step towards dropping Stackage support. We keep LTS 6.x
around because I don't want to downgrade our default compiler to GHC 7.x,
but once LTS 7.x comes out we'll switch our main package set to that and
drop Nightly.
More details are at:
http://permalink.gmane.org/gmane.linux.distributions.nixos/20505
Closes https://github.com/NixOS/nixpkgs/issues/14897 .
Also relevant:
- https://github.com/NixOS/nixpkgs/issues/16130
- https://github.com/commercialhaskell/stack/issues/2259
2016-07-21 14:41:44 +02:00
Robin Gloster
203846b9de
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-19 10:37:02 +00:00
Austin Seipp
cf63016f06
nixpkgs: build bitkeeper only on linux
...
The OS X build fails due to the dependency on 'crypt' failing. Perhaps
in future versions of BitKeeper this build can be re-enabled.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-07-18 19:59:18 +00:00
Wayne Scott
af056de900
nixpkgs: add bitkeeper-7.3ce
...
Closes #16928 .
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-07-18 05:22:18 -05:00
Nikolay Amiantov
aefd8c420c
Merge pull request #17043 from womfoo/fix/qmake4Hook-builds
...
reintroduce qmake .pro files after qmake4Hook changes
2016-07-18 00:11:24 +04:00
Miguel Madrid
1b9f6732c7
diff-so-fancy: 0.10.0 -> 0.10.1 ( #17033 )
2016-07-17 17:53:51 +02:00
Kranium Gikos Mendoza
2d529cfebb
guitone: fix qmake4Hook build
...
pass guitone.pro which was removed in 9a8a4b6
2016-07-17 22:41:34 +08:00
Robin Gloster
5185bc1773
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-15 14:41:01 +00:00
mimadrid
8c09317018
git: 2.9.0 -> 2.9.1
2016-07-13 15:43:49 +02:00
mimadrid
beec2ba127
diff-so-fancy: 0.9.3 -> 0.10.0
2016-07-05 22:54:14 +02:00
Shea Levy
6857424cf3
src: bump
2016-06-28 10:25:15 -04:00
zimbatm
de45c8d674
Merge pull request #16504 from cko/gitAndTools_git-extras
...
git-ant-tools.git-extras: 3.0.0 -> 4.1.0
2016-06-25 23:18:07 +01:00
Joachim Fasting
1e2d8bdb79
Merge pull request #16499 from mimadrid/update/meld-3.16.1
...
meld: 3.16.0 -> 3.16.1
2016-06-25 19:24:23 +02:00
mimadrid
ad16f79533
meld: 3.16.0 -> 3.16.1
2016-06-25 19:03:13 +02:00
Christine Koppelt
117fb73965
git-ant-tools.git-extras: 3.0.0 -> 4.1.0
2016-06-25 14:21:16 +02:00
Bjørn Forsman
bd01fad0ed
Captialize meta.description of all packages
...
In line with the Nixpkgs manual.
A mechanical change, done with this command:
find pkgs -name "*.nix" | \
while read f; do \
sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
done
I manually skipped some:
* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
zimbatm
5da1db3dcf
Merge pull request #16319 from mimadrid/update/bazaar-2.7.0
...
bazaar: 2.6.0 -> 2.7.0
2016-06-19 22:25:49 +01:00
mimadrid
cad9e875bc
bazaar: 2.6.0 -> 2.7.0
2016-06-18 23:46:32 +02:00
Alexey Lebedeff
552388f8df
diff-so-fancy: init at 0.9.3
...
Script was mentioned at GitHub blog -
https://github.com/blog/2188-git-2-9-has-been-released :)
2016-06-17 13:38:59 +03:00
Alexey Lebedeff
420b3c37ef
git: fix perl shebangs in contrib
...
There are a lot of scripts in contrib (e.g. `diff-highlight`) that
contain perl shebang line. But `patchShebangs` is unablle to fix this
without explicitly listing `perl` in `buildInputs`.
2016-06-16 23:47:56 +03:00
Nathan Zadoks
8d3df9f6c4
git: 2.8.3 -> 2.9.0
2016-06-15 10:56:29 -04:00
Vladimír Čunát
e68191e6c4
Merge #16216 : meld: 3.14.0 -> 3.16.0
2016-06-13 22:10:09 +02:00
mimadrid
1a9a72274a
meld: 3.14.0 -> 3.16.0
2016-06-13 21:21:16 +02:00
Christoph Hrdinka
077ac28f2c
mercurial: update source url
...
The old download url isn't reachable since a few weeks. The new one uses
mercurials domain instead of selenics.
2016-06-12 20:23:00 +02:00
Robin Gloster
8031cba2ab
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-06-10 09:27:04 +00:00
zimbatm
a5a1d45636
git-lfs: 1.2.0 -> 2016-06-07
...
Fixes import issues after go1.5+
2016-06-09 16:11:33 +02:00
Kamil Chmielewski
bbc37e0eb7
Moving from fetchgit generated by go2nix to fetchFromGitHub where rev is
...
a tag
2016-06-09 13:08:10 +02:00
Kamil Chmielewski
7eb671ebcd
no more goPackages
2016-06-09 13:08:00 +02:00
Kamil Chmielewski
ece0626593
git-lfs: extracted from goPackages
2016-06-09 11:21:30 +02:00
Peter Simons
1845843cdd
git-annex: take this tool from LTS Haskell while Stackage Nightly is broken
2016-06-06 09:33:30 +02:00
Tuomas Tynkkynen
bac26e08db
Fix lots of fetchgit hashes (fallout from #15469 )
2016-06-03 17:17:08 +03:00
Robin Gloster
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00:00
Kazunori Kajihiro
5c1f0990e3
hub: fix incorrect hash ( #15830 )
2016-05-30 14:23:32 +01:00
Vladimír Čunát
e4832c7541
Merge branch 'staging'
...
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Rok Garbas
800de8db21
git: 2.8.0 -> 2.8.3
2016-05-27 14:58:48 +02:00
Vladimír Čunát
81039713fa
Merge branch 'master' into staging
...
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Michael Raskin
3bf1348bf7
mercurial: 3.8.1 -> 3.8.2
2016-05-25 16:01:43 +02:00
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
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
Alexander Ried
9e073bd110
subversionClient: fix build with gcc5
...
fixes #15483
2016-05-20 14:38:14 +02:00
Tuomas Tynkkynen
7fb29bfa73
treewide: Make explicit that 'dev' output of zlib is used
2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
05d8174b0e
treewide: Make explicit that 'dev' output of subversion is used
2016-05-19 10:04:37 +02:00
Tuomas Tynkkynen
e80e4ba2bb
treewide: Make explicit that 'dev' output of sqlite is used
2016-05-19 10:04:34 +02:00
Tuomas Tynkkynen
3672f3edcb
treewide: Make explicit that 'dev' output of libxslt is used
2016-05-19 10:00:48 +02:00
Tuomas Tynkkynen
29694b43b6
treewide: Make explicit that 'dev' output of apr is used
2016-05-19 10:00:24 +02:00