JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
142,515 Commits 2 Branches 0 Tags 12 GiB
2c3575d7fe
Commit Graph

863 Commits

Author SHA1 Message Date
mimadrid
bc563c5973
git-cola: 2.10 -> 2.11 2017-08-01 20:48:21 +02:00
mimadrid
efb2b32bd7 gitAndTools.diff-so-fancy: 1.1.0 -> 1.1.1 2017-08-01 00:13:31 +02:00
Franz Pletz
75d53270cb
gitAndTools.diff-so-fancy: 0.11.4 -> 1.1.0 2017-07-18 18:04:16 +02:00
Tim Steinbach
eb5263a9f1
git: 2.13.2 -> 2.13.3 2017-07-13 08:45:43 -04:00
Jörg Thalheim
9d28cd9ca4 Merge pull request #27206 from nthorne/InitGitBigPicture 
git-big-picture: init at 0.9.0
 2017-07-13 09:54:26 +01:00
Alexander Schmolck
2c1097a83b git: add missing deps for filter-branch etc (#27221) 
Several git commands are implemented as shell scripts that run awk, sed, grep
and perl. There is some existing patching in the postinstall for perl to rewrite
it to an absolute reference to pkgs.perl, but several other packages are both
missing as a dependency and have no rewrite logic.

In particular git filter-branch depends on sed and grep.

Additionally, the perl logic also seds git-am, which is now a binary not a shell
script anymore (see <github.com/git/git/blob/master/builtin/am.c>), so this part
was obsolete.

I tested this by grepping all shell scripts for the relevant commands and then
comparing the diffs of the new version to what is produced in master. All
changes in the scripts seem good to me.
 2017-07-11 17:00:17 +01:00
Niklas Thörne
4ae629dd91 git-big-picture: init at 0.9.0 
Updated after review comments.
 2017-07-09 21:21:51 +02:00
Niklas Thorne
17dbed4c07 git-big-picture: init at 0.9.0 2017-07-07 14:12:02 +02:00
Tim Steinbach
1a25495b63
git: 2.13.1 -> 2.13.2 2017-06-25 21:13:23 -04:00
Tim Steinbach
385ba07615
git: 2.13.0 -> 2.13.1 2017-06-05 09:10:26 -04:00
montag451
cce8dbf8d3 git-annex-remote-rclone: 0.4 -> 0.5 2017-05-28 18:16:00 +02:00
Tim Steinbach
ce8662e693
git: 2.12.2 -> 2.13.0 2017-05-09 21:57:24 -04:00
Yann Hodique
c2cbe7c4cd tig: 2.2.1 -> 2.2.2 2017-05-07 14:22:29 -07:00
Jaakko Luttinen
dee8865d03
gitAndTools.gitflow: fix runtime dependencies #25487 
If `git-flow` was installed without explicitly installing `getopt` and `git`
too, it couldn't find those executables. Now it can find those and it can be
used as `git-flow` executable. Note, however, that in order to use `git-flow` as
git subcommand (`git flow`), one needs to install `git` too.
 2017-05-06 09:33:27 +03:00
Bjørn Forsman
83129a6eed qgit: fix meta: maintainer -> maintainers 2017-04-30 16:54:59 +02:00
José Luis Lafuente
7b20341727
git-recent: init at 1.0.3 2017-04-18 11:09:33 +02:00
José Luis Lafuente
cb624198e8
git-open: init at 1.3.0 2017-04-16 19:32:12 +02:00
Yann Hodique
04b30942bf ghq: init at 0.7.4 2017-04-14 20:59:45 -07:00
Yann Hodique
a78ce1d4c6 tig: 2.2 -> 2.2.1 (#24770) 
* tig: 2.2 -> 2.2.1

Also move to different project URLs, as requested in
https://github.com/jonas/tig/releases/tag/tig-2.2.1

* tig: fix fetching mechanism

Rework the dependencies to allow use of fetchFromGitHub.
 2017-04-10 15:03:04 +02:00
Aaron Bull Schaefer
55d1237c6b transcrypt: 1.0.1 -> 1.0.2 2017-04-05 11:18:12 -05:00
Jörg Thalheim
3e7c485e19 Merge pull request #24553 from ndowens/git-imerge 
git-imerge: 0.7.0 -> 1.0.0
 2017-04-02 23:39:53 +02:00
Jörg Thalheim
6df9e84773 Merge pull request #24554 from ndowens/git-radar 
git-radar: 0.3.2 -> 0.5
 2017-04-02 23:28:52 +02:00
Jörg Thalheim
a18ac4fd35 Merge pull request #24552 from ndowens/git-cola 
git-cola: 2.8 -> 2.10
 2017-04-02 23:26:29 +02:00
ndowens
ff4fa6387e diff-so-fancy: 0.11.1 -> 0.11.4 (#24562) 2017-04-02 22:22:32 +02:00
ndowens
6ee0d284c1 git-cola: 2.8 -> 2.10 
git-cola: Remove postFixup
 2017-04-02 08:56:18 -05:00
ndowens
02dddacc75 git-radar: 0.3.2 -> 0.5 2017-04-01 21:30:23 -05:00
ndowens
45fa146829 git-imerge: 0.7.0 -> 1.0.0 2017-04-01 21:24:08 -05:00
Orivej Desh
ecf5daa5d7 subgit: 3.1.0 -> 3.2.4 2017-04-01 02:19:51 +00:00
Tim Steinbach
10725a6329
git: 2.12.0 -> 2.12.2 2017-03-25 10:25:54 -04:00
Guillaume Maudoux
525a663174 curl, git: Fix curl default CA, let git use it 
Improve patching of curl to use NIX_SSL_CERT_FILE as default CA
Remove patches from git, as git uses curl and passes its environment
variables to curl.
 2017-03-22 11:22:53 +01:00
Domen Kožar
c3c9412c7d
git, openssl, curl: Respect $NIX_SSL_CERT_FILE 
Slightly modified version of 942dbf89c6
 2017-03-20 14:11:20 +01:00
Jörg Thalheim
d6f586bbff
git-octopus: init at 1.4 2017-03-14 21:01:10 +01:00
Eric Bailey
ea07961294
gitflow: tweak for darwin 
On Darwin, wrap the git-flow binary and set:

    FLAGS_GETOPT_CMD=${getopt}/bin/getopt

Without this change, I was getting the following error:

    flags:ERROR short flag required for (showcommands) on this platform
 2017-02-28 05:52:25 -06:00
Tim Steinbach
7611525c00
git: 2.11.1 -> 2.12.0 2017-02-26 16:18:42 -05:00
Franz Pletz
ae1c0add81
git-dit: fix evaluation 
cc @Profpatsch
 2017-02-25 11:48:22 +01:00
Profpatsch
e1656bc46d git-dit: init at 0.1.0 2017-02-25 10:18:43 +01:00
Changlin Li
f6dd263d42 bfg-repo-cleaner: init at 1.12.15 2017-02-12 01:53:08 -05:00
Tim Steinbach
c1e7832591
git: 2.11.0 -> 2.11.1 2017-02-03 18:54:35 -05:00
Peter Hoeg
3d16d69b40 qgit: 2.5 -> 2.6 (#22360) 
Also:

 - build the qt5 version by default instead of qt4
 - use cmake
 2017-02-02 02:55:47 +01:00
Robert Helgesson
41a0d05872
git-hub: 0.10 -> 0.11.0 
Includes fixes for CVE-2016-7793 and CVE-2016-7794.
 2017-01-29 17:04:57 +01:00
Jörg Thalheim
202b953c92
bitbucket-server-cli: use gemdir 2017-01-18 00:52:54 +01:00
Eric Bailey
a0e5cbbd6a
hub: 2.2.8 -> 2.2.9 2017-01-09 19:10:18 -06:00
Aaron Bull Schaefer
196eb75b88 transcrypt: 1.0.0 -> 1.0.1 2017-01-05 16:20:45 -08:00
jgertm
52a7b6549f bitbucket-server-cli: init at 0.7.0 (#21616) 2017-01-05 10:21:06 +00:00
Aaron Bull Schaefer
e98bd77ef3 transcrypt: 0.9.9 -> 1.0.0 2017-01-01 11:49:22 -08:00
Vladimír Čunát
dbde4eb465
gitAndTools.qgitGit: remove 
It's rather old and abandoned, the source is dead, and our stable qgit
version seems more recent.  /cc @MarcWeber.
 2016-12-30 12:30:35 +01:00
Bjørn Forsman
bef30f322f cgit: 0.12 -> 1.1 2016-12-27 15:46:22 +01:00
Chris Martin
18ee6b9a6d git-bz: add pycrypto dependency (#21013) 2016-12-08 22:59:53 -05:00
Tim Steinbach
f1a0cadaec
git: 2.10.2 -> 2.11.0 2016-11-29 18:37:24 -05:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Frederik Rietdijk
643b12221a stgit: use python2 2016-11-24 22:28:02 +01:00
Frederik Rietdijk
bea967016e git-hub: use python2 2016-11-24 22:28:02 +01:00
montag451
278196e854 git-annex-remote-rclone: init at 0.4 2016-11-23 21:06:21 +01:00
montag451
d212fc99f4 git-remote-gcrypt: 20140715 -> 1.0.0 (#20623) 2016-11-22 03:46:26 +01:00
Alex Dunn
80bff0b459 git: link git-credential-netrc into $out/bin 2016-11-19 13:36:30 -08:00
Tim Steinbach
ef4a335be4
git: 2.10.1 -> 2.10.2 2016-11-15 18:05:02 -05:00
Jascha Geerds
6de23f466b gitAndTools.gitflow: 1.10.0 -> 1.10.2 2016-10-29 15:59:07 +02:00
Frederik Rietdijk
e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Vladimír Čunát
4d5b893002 Merge #19081: gnome-3.22 
Also master commits are brought in.
 2016-10-20 23:04:10 +02:00
Frederik Rietdijk
c431f11d1f gitAndTools.git-hub: use python2 
imports urllib2
 2016-10-18 23:16:04 +02:00
Frederik Rietdijk
9b68f4272c git-cola: 2.5 -> 2.8 2016-10-17 22:11:33 +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
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
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
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
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
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
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
bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02: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
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
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
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00: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
Miguel Madrid
1b9f6732c7 diff-so-fancy: 0.10.0 -> 0.10.1 (#17033) 2016-07-17 17:53:51 +02: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
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
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
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Kamil Chmielewski
7eb671ebcd no more goPackages 2016-06-09 13:08:00 +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
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
29694b43b6 treewide: Make explicit that 'dev' output of apr is used 2016-05-19 10:00:24 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01: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
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks 
changes:
 * buildPhase = "true"
 * buildPhase = ":"
 2016-05-04 10:11:04 +00:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00: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
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
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
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00: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
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
zimbatm
6579acd015 git: add openssh as a runtime dependency 
Fixes #1923
 2016-03-26 14:39:57 +00:00
Yann Hodique
31c317e09e git: 2.7.3 -> 2.7.4 2016-03-18 18:07:33 -07:00
Peter Simons
abcf57a8db git: update from version 2.7.1 to 2.7.3 2016-03-16 21:35:55 +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
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00: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
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
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
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
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
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
Robin Gloster
c9aceaea86 gitAndTools.qgit: turn off format hardening 2016-02-09 11:04:13 +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
Tuomas Tynkkynen
e97e690244 treewide: Mass replace 'xz}/bin' to refer the 'bin' output 2016-02-01 20:46:28 +02:00
Tuomas Tynkkynen
5f4a8de754 treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output 2016-02-01 20:45:57 +02:00
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Jascha Geerds
f7578a4d32 gitflow: 1.8.0 -> 1.9.1 2016-01-27 17:15:42 +01:00
Christoph Hrdinka
890f000146 goPackages.git-annex-remote-b2: init at 0.2 2016-01-26 17:54:53 +01: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
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Vladimír Čunát
c169718a6b git-bz: fix meta typo 
Thanks to @heydojo.
 2016-01-15 10:26:18 +01:00
Tobias Geerinckx-Rice
d1440745c6 git-bz: meta: un-break; fix licence; maintain 
CC @nbp (I assume it was abandoned years ago, apologies otherwise).
 2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
36a68c8b6b git-bz: 3.20110902 -> 3.2015-09-08 2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
123065aa3d git-bz: use callPackage and canonical package name 
Don't add a compatibility alias as this package was/is marked as
being broken anyway.
 2016-01-15 05:31:47 +01:00
somaticweb
2c4c9bee13 git: 2.6.4 -> 2.7.0 
Also corrected the license, which is GPL2-only
 2016-01-05 22:15:17 -08:00
janus
a472d836f6 FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep 2016-01-01 17:01:13 +00:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Matt McHenry
090efc2907 subgit: init at 3.1.0 2015-12-28 22:59:23 -05:00
Eric Merritt
6108bb8971 hub: 2.2.1 -> 2.2.2 2015-12-23 08:37:02 -08:00
Peter Simons
e5b15f6b52 Merge pull request #11838 from k0ral/git 
git: 2.6.3 -> 2.6.4
 2015-12-20 11:55:57 +01:00
koral
016e88b2d2 git: 2.6.3 -> 2.6.4 2015-12-19 17:37:37 +00:00
Igor Pashev
85375fc5fc git-crypt needs GnuPG 2015-12-17 11:00:50 +03:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Vladimír Čunát
263fd55d4b Merge recent staging built on Hydra 
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
 2015-12-05 11:11:51 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Tobias Geerinckx-Rice
2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Jude Taylor
69e7f3bb74 switch to zero underscores for sandbox profiles; remove generateFrameworkProfile 2015-11-21 12:10:33 -08:00
Jude Taylor
a63346e33c use single underscore for sandboxProfile 2015-11-21 11:17:30 -08:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Jude Taylor
df80090d09 use per-derivation sandbox profiles 2015-11-19 11:31:06 -08:00
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" 
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
 2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream 
This is a partial merge of staging for builds which are working
 2015-11-13 15:53:10 -08:00
Stéphane Jourdois
221965a918 tig: add libiconv dep on darwin 2015-11-07 13:51:43 +01:00
William A. Kennington III
1e7aa4f17d Merge branch 'master.upstream' into staging.upstream 2015-11-05 18:30:11 -08:00