Frederik Rietdijk
57b9ff06f1
Remove top-level pylint
...
See #11567 .
2016-08-14 13:07:26 +02:00
Frederik Rietdijk
11d1fdfd8b
Remove top-level cython and cython3
...
See #11567 .
2016-08-14 12:01:09 +02:00
Franz Pletz
bd4490e277
Merge branch 'master' into hardened-stdenv
2016-08-13 16:59:55 +02:00
Luca Bruno
c8ca30fe2a
Merge pull request #17247 from lucas8/yadm
...
yadm: init at 1.04
2016-08-12 22:08:29 +01:00
zimbatm
c2302f2f45
Merge pull request #17677 from kamilchm/no-go-libs-json
...
buildGoPackage: remove Go deps file `libs.json`
2016-08-12 18:13:29 +01:00
Miguel Madrid
bd20aaa767
diff-so-fancy: 0.10.1 -> 0.11.1 ( #17691 )
2016-08-12 15:12:29 +02:00
Robin Gloster
b7787d932e
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-12 09:46:53 +00:00
Kamil Chmielewski
da3ddd48e4
buildGoPackage: remove Go deps file libs.json
...
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046
> Because of the content-addressable store, if two programs have the
> same dependency it will already result in the same derivation in
> the
> store. Git also has compression in the pack files so it won't make
> much difference to duplicate the dependencies on disk. And finally
> most users will just use the binary builds so it won't make any
> differences to them.
This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
lucas8
3f6d3faf1e
yadm: using fetchFromGitHub
2016-08-06 23:59:54 +02:00
Franz Pletz
c39b6025d8
gitlab: 8.5.12 -> 8.10.3, update module
...
Fixes #14795 .
2016-08-04 02:29:44 +02:00
Robin Gloster
da1a6f4490
Merge pull request #17491 from phile314/git-lfs-update
...
git-lfs: 2016-06-7 -> 1.3.1
2016-08-03 23:51:43 +02:00
Philipp Hausmann
d94ec6ce14
git-lfs: 2016-06-7 -> 1.3.1
2016-08-03 22:36:01 +02:00
Robin Gloster
1b979d8384
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6
treewide: Add lots of meta.platforms
...
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b
treewide: Add lots of platforms to packages with no meta
...
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
1bf5ded193
treewide: Lots of meta.hydraPlatforms -> meta.platforms
...
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03:00
Franz Pletz
b0d748e244
bitkeeper: disable fortify hardening
2016-08-02 17:49:08 +02:00
Robin Gloster
63c7b4f9a7
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-31 20:51:34 +00:00
lucas8
849414f276
yadm: init at 1.04
2016-07-30 11:40:37 +02: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
Tuomas Tynkkynen
16cc4ac83b
treewide: Make explicit that 'dev' output of apacheHttpd is used
2016-05-19 10:00:23 +02:00
Pascal Wittmann
8029ee27b6
subversion: 1.9.3 -> 1.9.4 (fixes CVE-2016-2168, CVE-2016-2167)
2016-05-18 21:34:25 +02:00
Pascal Wittmann
032ba2d578
subversion: 1.8.15 -> 1.8.16 (fixes CVE-2016-2168, CVE-2016-2167)
2016-05-18 21:34:25 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
Frederik Rietdijk
197ff2c5aa
Merge pull request #15518 from danbst/thg81
...
tortoisehg: 3.7.3 -> 3.8.1
2016-05-17 14:43:34 +02:00
Domen Kožar
b49bf121b8
rename iElectric to domenkozar to match GitHub
2016-05-17 13:00:47 +01:00
danbst
2f24e11992
tortoisehg: 3.7.3 -> 3.8.1
2016-05-17 14:02:06 +03:00
Peter Simons
8e462995ba
Bring my stdenv.lib.maintainers user name in line with my github nick.
2016-05-16 22:49:55 +02:00
Vladimír Čunát
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
Andrey Pavlov
f5668437ab
hub: 2.2.2 -> 2.2.3
2016-05-06 10:39:29 +03:00
Michael Raskin
9dc5dcf6db
mercurial: 3.7.3 -> 3.8.1
2016-05-05 20:30:59 +02:00
Vladimír Čunát
1dc36904d8
Merge #14920 : windows improvements, mainly mingw
2016-05-05 08:30:19 +02:00
Robin Gloster
9820cb1bf2
use dontBuild instead of hacks
...
changes:
* buildPhase = "true"
* buildPhase = ":"
2016-05-04 10:11:04 +00:00
Franz Pletz
2acea21155
gitlab: 8.5.7 -> 8.5.12
2016-05-04 01:24:55 +02: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
Robin Gloster
c92bca56f8
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-02 22:58:02 +00:00
Eelco Dolstra
8a854c2647
Merge pull request #15111 from rardiol/subversionPerl
...
subversion: fix apr-1 linking related to #14495
2016-05-02 10:56:28 +02:00
zimbatm
6cf44fed13
Merge pull request #15113 from rardiol/gitSVN
...
git: fix subversion bindings for multiple outputs
2016-05-01 10:10:31 +01:00
Ricardo Ardissone
e5a9d64787
git: fix subversion bindings for multiple outputs
2016-04-30 13:19:14 -03:00
Ricardo Ardissone
025ccbccd7
subversion: fix apr-1 linking
2016-04-30 12:13:26 -03:00
zimbatm
d2b176ace5
Merge pull request #14617 from nathan7/git-ssl-cert-file
...
git: respect $SSL_CERT_FILE
2016-04-29 23:03:52 +01:00
Tobias Geerinckx-Rice
aa8bc97dd6
git-hub -> gitAndTools.git-hub (with alias)
2016-04-29 21:42:35 +02:00
Tobias Geerinckx-Rice
2415254a52
git-hub: 0.9.0 -> 0.10
2016-04-29 21:42:35 +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
Tuomas Tynkkynen
4ff8f377af
Merge remote-tracking branch 'upstream/master' into staging
2016-04-28 00:13:53 +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
Eric Seidel
2177bf3074
fossil: add libiconv on darwin
2016-04-25 09:12:05 -07:00
Nikolay Amiantov
ab0a0c004e
makeSearchPathOutputs: refactor to makeSearchPathOutput
2016-04-25 13:24:39 +03:00
Joachim Fasting
f49b9fe9d9
Merge pull request #14892 from danbst/tortoisehg-refactor
...
tortoisehg: 3.7.1 -> 3.7.3, refactor
2016-04-22 19:05:56 +02:00
danbst
2fce49d3e8
tortoisehg: 3.7.1 -> 3.7.3, refactor
...
update tortoisehg to 3.7.3 and remove source patch in build expression.
setup.py in TortoiseHG computes wrong paths in `build` phase
(upstream bug https://bitbucket.org/tortoisehg/thg/issues/4483/problems-with-setuppy-on-posix-systems ).
So we skip this phase and perform install manually (the `build` phase is still performed as subcommand).
2016-04-22 16:00:43 +00:00
danbst
e36339fd80
mercurial: add comment for maintainers on version bump
2016-04-22 15:59:40 +00:00
Vladimír Čunát
e9379f7416
Merge branch 'staging'
...
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00