1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

1637 commits

Author SHA1 Message Date
Frederik Rietdijk 2c4fbe30fe bazaar: use python 2 2016-10-18 23:14:33 +02:00
Frederik Rietdijk 9b68f4272c git-cola: 2.5 -> 2.8 2016-10-17 22:11:33 +02:00
derchris cfb843b9a9 gource: 0.43 -> 0.44 2016-10-17 15:14:28 +02:00
zimbatm 13293d108d Merge pull request #19459 from dipinhora/git-osxkeychain
git: enable credential-osxkeychain for darwin
2016-10-16 12:03:31 +01:00
Franz Pletz 9df6c89a6e
gitlab: 8.12.1 -> 8.12.6 2016-10-14 17:34:29 +02:00
Eelco Dolstra 811b876fab Revert "openssl, curl, git: Respect $NIX_SSL_CERT_FILE"
This reverts commit 942dbf89c6. Sorry,
this was supposed to go to staging instead of master...
2016-10-14 16:01:54 +02:00
Vladimír Čunát 061758490f Merge branch 'master' into staging
... to get the openssl mass rebuild: 942dbf89c.
2016-10-14 13:16:11 +02:00
Eelco Dolstra 942dbf89c6 openssl, curl, git: Respect $NIX_SSL_CERT_FILE
$NIX_SSL_CERT_FILE overrides $SSL_CERT_FILE, which in turn overrides
the default CA path (/etc/ssl/certs/ca-certificates.crt). This allows
Nix to set a CA path without interfering with other packages (such as
Homebrew).

See https://github.com/NixOS/nix/issues/921.
2016-10-14 12:06:10 +02:00
Vladimír Čunát 6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Frederik Rietdijk efb6052f40 Python: fixup modules that were removed 2016-10-13 22:11:30 +02:00
Frederik Rietdijk cffdffe1f6 Merge pull request #19309 from FRidh/outputs
Python: use separate output for tkinter
2016-10-13 10:40:14 +02:00
romildo 83d25e490b smartgithg: 7_1_2 -> 8_0_3 2016-10-12 20:15:35 -03:00
Jascha Geerds 19c42ee0b7 gitAndTools.gitflow: 1.9.1 -> 1.10.0 2016-10-11 23:38:29 +02:00
dipinhora 641a1e433a git: enable credential-osxkeychain for darwin 2016-10-11 15:25:08 -04:00
Frederik Rietdijk 104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
Joachim F 9270aa6677 Merge pull request #19388 from cko/git-extras
git-extras: 4.1.0 -> 4.2.0
2016-10-09 14:08:13 +02:00
Robin Gloster 30accf4d3e
treewide: fix licence -> license occurences 2016-10-09 12:45:32 +02:00
Christine Koppelt 9d85dd7ec0 git-extras: 4.1.0 -> 4.2.0 2016-10-09 12:37:22 +02:00
Frederik Rietdijk 2fb5289d83 git: 2.10.0 -> 2.10.1 2016-10-05 10:37:09 +02:00
Michael Fellinger c2f6752e01
git-crypt: remove platforms
fixes #18811
2016-10-01 00:48:12 +02:00
Graham Christensen f9c9c1dac8
redmine: mark as broken
https://github.com/NixOS/nixpkgs/issues/18856
2016-09-28 08:52:17 -04:00
Franz Pletz 77779323c5
gitlab: 8.11.2 -> 8.12.1 2016-09-27 18:41:02 +02:00
Eelco Dolstra 81447b6a59 subversion: Remove openssl.dev from the runtime closure 2016-09-26 19:58:57 +02:00
Aneesh Agrawal e6897a3fb4 mercurial: Pin to Python 2 2016-09-26 11:41:54 -04:00
Frederik Rietdijk 9c5610d759 bazaar: use buildPythonApplication 2016-09-26 14:16:18 +02:00
Frederik Rietdijk 3ba16c8234 Do not use top-level buildPythonPackage or buildPythonApplication
but instead use the one in pythonPackages.
2016-09-26 11:10:51 +02:00
Frederik Rietdijk 24314edbc8 diffuse: do not use top-level python packages 2016-09-25 23:12:26 +02:00
Thomas Tuegel 1e741cf603 Merge pull request #18926 from PierreR/master
vcsh: 1.20141026-1 -> 1.20151229-1
2016-09-24 10:10:24 -05:00
Pierre Radermecker e9bac709e2 vcsh: 1.20141026-1 -> 1.20151229-1 2016-09-24 16:50:08 +02:00
Tim Steinbach d965064280
tortoisehg: 3.8.1 -> 3.9.1 2016-09-23 11:51:54 -04:00
Tim Steinbach 18b5e607d9
mercurial: 3.8.2 -> 3.9.1 2016-09-23 11:50:14 -04:00
Damien Cassou 4d15b2cdb0
hub: 2.2.5 -> 2.2.8 2016-09-22 09:26:58 +02:00
Kamil Chmielewski 914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01:00
Nikolay Amiantov 4748709926 Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs 2016-09-13 12:51:34 +03:00
Domen Kožar d6a4a30fb1 pijul: build only on 64bit platforms
(cherry picked from commit 8479962862)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-13 10:37:55 +02:00
Franz Pletz fb9117efa6 Merge pull request #18488 from chris-martin/md5-2
Miscellaneous packages: Use sha256 instead of md5 (part 2)
2016-09-13 07:11:43 +02:00
Kirill Boltaev bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Chris Martin f7c0a9c9cc kdesvn: md5->sha256 2016-09-10 13:51:20 -04:00
Peter Simons f649d4eefa git-annex: fix GHC 8.x build 2016-09-09 13:55:39 +02:00
Aaron Bull Schaefer 598ccfdec9 transcrypt: 0.9.7 -> 0.9.9 2016-09-06 14:55:19 -07:00
J Phani Mahesh 2b86ccbf32 git: 2.9.3 -> 2.10.0 2016-09-03 16:20:32 +05:30
Gabriel Ebner b6f9f3de46 Merge pull request #18236 from mimadrid/update/hub-2.2.5
hub: 2.2.3 -> 2.2.5
2016-09-03 07:35:55 +02:00
mimadrid 307a4650c8
hub: 2.2.3 -> 2.2.5 2016-09-03 00:38:38 +02:00
Frederik Rietdijk 01fafc088a peru: 0.2.3 -> 1.0.1, fix build 2016-09-02 20:52:26 +02:00
Parnell Springmeyer 98c058a1ee Adapting everything for the merged permissions wrappers work. 2016-09-01 19:21:06 -05:00
Tuomas Tynkkynen 3364230d56 Disable bunch of non-compiling packages on Darwin
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
2016-09-01 20:39:33 +03:00
Tuomas Tynkkynen 048a30e4e4 treewide: Fix dev references to libxml2 2016-08-30 03:02:32 +03:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
obadz 3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Franz Pletz d70f83e7e9
gitlab: 8.10.6 -> 8.11.2 2016-08-26 15:03:19 +02:00
Lluís Batlle i Rossell 3aa8f23aec fossil: update to 1.35 2016-08-25 17:27:55 +02:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Nikolay Amiantov 55d9db7139 gource: fix build 2016-08-22 07:42:36 +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
Peter Simons bdc38c6a67 Merge pull request #17829 from mimadrid/update/git-2.9.3
git: 2.9.2 -> 2.9.3
2016-08-19 10:16:46 +02:00
mimadrid 7f3a4688f0
git: 2.9.2 -> 2.9.3 2016-08-18 21:13:00 +02:00
Silvio Fricke dc7c848e10 tig: 2.1.1 -> 2.2
Signed-off-by: Silvio Fricke <silvio.fricke@gmail.com>
2016-08-18 16:24:25 +02:00
Franz Pletz 131bc22b84 gitlab service: add option for db_key_base secret 2016-08-17 13:17:47 +02:00
Franz Pletz b070a9c439 gitlab: 8.10.3 -> 8.10.6 2016-08-17 05:36:24 +02:00
Frederik Rietdijk 5a501bd828 Remove top-level dbus_python and pythonDBus.
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
2016-08-16 22:52:37 +02:00
Frederik Rietdijk 6d75bf842b mercurial: pass in pythonPackages 2016-08-16 11:48:09 +02:00
Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Frederik Rietdijk 7986b718f3 Remove pycairo from top-level
See #11567.
2016-08-14 13:52:42 +02:00
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
Nikolay Amiantov 9a8a4b6efe guitone: move to qmake4Hook 2016-04-20 18:55:48 +03:00
Nikolay Amiantov e5e09e8cc7 svn2git-kde: move to qmake4Hook 2016-04-20 18:55:48 +03:00
Nikolay Amiantov 9325393959 qgit-git: move to qmake4Hook 2016-04-20 18:55:48 +03:00
Nikolay Amiantov a4e868a102 qgit: move to qmake4Hook 2016-04-20 18:55:48 +03:00
Nikolay Amiantov 661641aeb7 git-and-tools: move to callPackage 2016-04-20 18:55:48 +03:00
Tadas Barzdzius a2973df033 pijul: use stable rustPlatform 2016-04-20 15:08:12 +03:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Nikolay Amiantov 8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Vladimír Čunát 39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Nathan Zadoks 9eced61d2a git: respect $SSL_CERT_FILE
This allows git to work on systems without
/etc/ssl/certs/ca-certificates.crt, such as OS X, instead of failing
with "error setting certificate verify locations".
2016-04-12 11:47:56 +02:00
Dan Connolly a4ce0e233b tortoisehg: 3.6 -> 3.7.1, fixes package
fixes #13507

On June 8 (e8655ee) tortoisehg changed the way
it computes the `/usr/share` directory in a way that
invalidated the assumptions behind the use
of substituteInPlace in postUnpack.
2016-04-11 10:35:31 +02:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Graham Christensen f9099deb8e mercurial: 3.7.1 -> 3.7.3 for multiple CVEs
CVE-2016-3068

    Blake Burkhart discovered that Mercurial allows URLs for Git
    subrepositories that could result in arbitrary code execution on
    clone.

CVE-2016-3069

    Blake Burkhart discovered that Mercurial allows arbitrary code
    execution when converting Git repositories with specially
    crafted names.

CVE-2016-3630

    It was discovered that Mercurial does not properly perform bounds-
    checking in its binary delta decoder, which may be exploitable for
    remote code execution via clone, push or pull.
2016-04-07 21:24:49 -05: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
Franz Pletz 2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Bob van der Linden 318fdda01c git-cola: 2.2.1 -> 2.5 2016-03-30 20:25:50 +02:00
zimbatm 0592eb377e Merge pull request #14207 from zimbatm/git-and-ssh
git: add openssh as a runtime dependency
2016-03-30 10:23:55 +01:00
Robin Gloster a4e65c3639 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-30 09:01:20 +00:00
Louis Taylor 69c6f7e20a git: 2.7.4 -> 2.8.0 2016-03-29 07:21:41 +01:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Frederik Rietdijk 4c13595507 Merge pull request #14093 from matthiasbeyer/add-be
bugseverywhere: init at 1.1.1
2016-03-28 14:39:38 +02:00
Matthias Beyer 729c069108 bugseverywhere: init at 1.1.1 2016-03-28 14:35:47 +02:00
Domen Kožar b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
zimbatm 6579acd015 git: add openssh as a runtime dependency
Fixes #1923
2016-03-26 14:39:57 +00:00
Evgeny Egorochkin 5db2d9366b subversion: fix hash 2016-03-21 12:47:54 +02:00
zimbatm 64fe2b5eb6 gitlab: remove unused parameter 2016-03-19 22:04:12 +00:00
Yann Hodique 31c317e09e git: 2.7.3 -> 2.7.4 2016-03-18 18:07:33 -07:00
Franz Pletz 1cd99b1a48 gitlab: 8.5.5 -> 8.5.7 2016-03-17 03:39:16 +01:00
Peter Simons abcf57a8db git: update from version 2.7.1 to 2.7.3 2016-03-16 21:35:55 +01:00
Robin Gloster 3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
joachifm 94f7f756b0 Merge pull request #13855 from jraygauthier/jrg/update_smart_git_from_710_to_712
smartgit: 7.1.0 -> 7.1.2
2016-03-14 15:12:30 +00:00
Raymond Gauthier 62f47641b1 smartgithg: 7.1.0 -> 7.1.2
Also fixes broken download link.
2016-03-14 10:27:22 -04:00
Robin Gloster 3f9b00c2d8 Merge pull request #13906 from Zer0-/gitlab_version_bump
Gitlab version bump
2016-03-14 13:29:13 +01:00
Philipp Volguine a2424fffd3 Gitlab package version 8.5.1 -> 8.5.5
-had to bump the versions on a few gem dependencies
2016-03-13 21:05:11 +00:00
Graham Christensen bdb1e5c73f svn: convert sha1 to sha256 2016-03-11 15:54:55 -06:00
Eelco Dolstra dd53c65dcc Merge remote-tracking branch 'origin/gcc-5' into staging
Still some breakage but no blockers:

http://hydra.nixos.org/eval/1242130?filter=x86_64-linux&compare=1237852&full=#tabs-now-fail
2016-03-11 16:02:38 +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
Franz Pletz e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
zimbatm 75d7692ab3 gitAndTools.darcsToGit: 0.2git -> 2015-06-04
Fixes error where ruby 2.0+ doesn't have iconv anymore.

    `require': cannot load such file -- iconv (LoadError)
2016-03-05 18:45:39 +00:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster fed49425c5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-03 16:11:55 +00:00
Nathan Zadoks 819dab0203 git-remote-hg: fix the derivation name
-v0.2 isn't parsed as a version by Nix, and makes it inconvenient to
install git-remote-hg through nix-env.
2016-03-03 14:51:31 +01:00
Eelco Dolstra 1c74a16e10 rcs: Fix build on gcc 5
http://hydra.nixos.org/build/32624218
2016-03-03 13:10:22 +01:00
Robin Gloster 4c9c4c4dcd redmine: disable format hardening 2016-03-01 22:47:29 +00:00
Robin Gloster d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
zimbatm de8c119a4b redmine: fix compilation with ruby 2.3
Just bumped the JSON dependency manually to the one bundled with ruby 2.3
2016-02-29 10:02:59 +00:00
Robin Gloster 3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
Bjørn Forsman 070dccae7b gitstats: init at 2016-01-08
Upstream does not make releases, using latest commit from master branch.
2016-02-28 15:00:52 +01:00
Bjørn Forsman d589391202 gitinspector: 0.4.1 -> 0.4.4 2016-02-28 11:32:09 +01:00
Graham Christensen 73f6410851 cgit: 0.11.2 -> 0.12 for CVE-2016-1899 CVE-2016-1900 CVE-2016-1901 2016-02-27 15:35:19 -06: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
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
zimbatm 8d4c2340d3 Merge pull request #13396 from mayflower/pkg/gitlab
gitlab: 8.0.5 -> 8.5.1, service improvements
2016-02-26 11:19:28 +00:00
Franz Pletz af17efd014 Merge pull request #13466 from benley/git-stree-0.4.5
git-stree: init at 0.4.5
2016-02-26 09:59:47 +01:00
Franz Pletz c2412bd700 fixup! gitlab: 8.0.5 -> 8.5.0, service improvements
8.5.0 -> 8.5.1
2016-02-26 08:31:21 +01:00
Franz Pletz bcfa59bf82 gitlab: 8.0.5 -> 8.5.0, service improvements
Updates gitlab to the current stable version and fixes a lot of features that
were broken, at least with the current version and our configuration.

Quite a lot of sweat and tears has gone into testing nearly all features and
reading/patching the Gitlab source as we're about to deploy gitlab for our
whole company.

Things to note:

 * The gitlab config is now written as a nix attribute set and will be
   converted to JSON. Gitlab uses YAML but JSON is a subset of YAML.
   The `extraConfig` opition is also an attribute set that will be merged
   with the default config. This way *all* Gitlab options are supported.

 * Some paths like uploads and configs are hardcoded in rails  (at least
   after my study of the Gitlab source). This is why they are linked from
   the Gitlab root to /run/gitlab and then linked to the  configurable
   `statePath`.

 * Backup & restore should work out of the box from another Gitlab instance.

 * gitlab-git-http-server has been replaced by gitlab-workhorse upstream.
   Push & pull over HTTPS works perfectly. Communication to gitlab is done
   over unix sockets. An HTTP server is required to proxy requests to
   gitlab-workhorse over another unix socket at
   `/run/gitlab/gitlab-workhorse.socket`.

 * The user & group running gitlab are now configurable. These can even be
   changed for live instances.

 * The initial email address & password of the root user can be configured.

Fixes #8598.
2016-02-26 07:08:31 +01:00
zimbatm 428e12d23f Merge pull request #13154 from zimbatm/git-rebase-fix-v2
git: fixes references to gettext properly
2016-02-26 00:03:17 +00:00
Benjamin Staffin fe6ad9e912 git-stree: init at 0.4.5 2016-02-25 15:26:06 -08:00
Benjamin Staffin ca5f243697 git-and-tools: alphabetize attributes before it gets too huge 2016-02-25 14:23:34 -08:00
Robin Gloster 40c586b7ce Merge pull request #13427 from k0ral/mercurial
mercurial: 3.5.1 -> 3.7.1
2016-02-25 17:00:58 +01:00
koral d4193c82c1 mercurial: 3.5.1 -> 3.7.1 2016-02-24 16:39:03 +01:00
Wout Mertens 677893f92b Merge pull request #13422 from k0ral/git
git: 2.7.0 -> 2.7.1
2016-02-24 15:09:28 +01:00
koral c1504c5a94 git: 2.7.0 -> 2.7.1 2016-02-24 13:47:23 +01: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
Robin Gloster 4036e9ba8c Merge branch 'up' into hardened-stdenv 2016-02-20 22:27:33 +00:00
zimbatm 11733b39b5 git: fixes references to gettext properly
A better implementation of 5273dbf530

Fixes https://github.com/NixOS/nixpkgs/issues/13150

The attached patch removes a whole swath of unnecessary runtime gettext
detection. It also adds gettext on the PATH so that git-rebase can find it.
2016-02-20 14:47:23 +00:00
Ricardo M. Correia fd3e02add8 Merge pull request #13027 from puffnfresh/package/pijul
pijul: 0.1 -> 0.2-6ab9ba
2016-02-20 15:43:53 +01:00
Robin Gloster bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Frederik Rietdijk 4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
zimbatm c38eb526d5 git: fix references to gettext in bash scripts
See #13047
2016-02-16 21:01:21 +00:00
Brian McKenna 93328bbd62 pijul: 0.2-6ab9ba
Maintainer has been working with us, this commit was given by them.
2016-02-17 07:28:26 +11:00
Franz Pletz 41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Vladimír Čunát 4538e70661 smartgithg: update 7_0_2 -> 7_1_0 2016-02-10 23:03:15 +01:00
Robin Gloster c9aceaea86 gitAndTools.qgit: turn off format hardening 2016-02-09 11:04:13 +00:00
Robin Gloster e06726ba15 rcs: use std=gnu99 to compile with gcc5 2016-02-09 01:23:58 +00:00
Robin Gloster 53e3de101b cvs: turn off format hardening 2016-02-07 19:23:40 +00:00
Vladimír Čunát a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Robin Gloster 9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Robin Gloster 5b67ed7c55 Merge pull request #12819 from Beauhurst/hg_crecord_revert
hg_crecord: revert changes adding mercurial crecord
2016-02-05 21:24:19 +01:00
Michael Raskin 0d1a188c5d Re-add Monotone-Viz with Fedora as a source 2016-02-04 20:13:49 +01:00
Robert Scott d192057519 hg_crecord: revert changes adding mercurial crecord
crecord is included in modern hg releases - I failed to realize this.
2016-02-04 15:13:24 +00:00
Vladimír Čunát 54299b60c4 Merge #12779: Mass replace pkg}/bin-style strings
... to refer to correct outputs
2016-02-03 17:25:22 +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
Guillaume Maudoux 9f358f809d Configure a default trust store for openssl 2016-02-03 12:42:01 +01:00