Commit Graph

78 Commits

Author SHA1 Message Date
piegames
ae207af82b treewide: More string indentation fixes
Follow-up on #350296 with the packages that cause big rebuilds and need
to go through staging.
2024-10-23 21:52:18 +02:00
Simon Žlender
9dab1c76b5 git: fix darwin to linux cross-compilation 2024-10-12 18:42:38 +02:00
Muhammad Falak R Wani
d17b829d6d git: 2.46.2 -> 2.47.0
Changelog: https://github.com/git/git/blob/v2.47.0/Documentation/RelNotes/2.47.0.txt
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
2024-10-10 13:58:28 +05:30
Muhammad Falak R Wani
ab19ce9f8d git: 2.46.1 -> 2.46.2
Changelog: https://github.com/git/git/blob/v2.46.2/Documentation/RelNotes/2.46.2.txt
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
2024-09-25 22:00:08 +05:30
Artturin
f0e657f3b1 Merge branch 'master' into staging-next 2024-09-25 06:05:01 +03:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Sergei Trofimovich
892b7e93c8 git: 2.46.0 -> 2.46.1
Changes: https://lore.kernel.org/all/023601db070c$db740f60$925c2e20$@nexbridge.com/T/
2024-09-19 09:11:41 +01:00
Michael Lohmann
51930e0343 git: re-enable a few tests that are fixed upstream
- t5150: now has the proper perl prerequisite check:
  https://git.kernel.org/pub/scm/git/git.git/tree/t/t5150-request-pull.sh?h=v2.43.0#n10
- t5319: flake was fixed:
  https://git.kernel.org/pub/scm/git/git.git/commit/?id=152923b132d57e1dbd693a8cb9a8bc1827405674
- t1700: no idea what did the fix, but it is working again
2024-08-19 21:36:40 +02:00
Adam Dinwoodie
dd0e6df0ff git: 2.45.2 -> 2.46.0 2024-07-30 15:01:40 +01:00
Audrey Dutcher
2b6b8e29c7
git: fix build on FreeBSD native (#328779)
* git: build with libiconvReal on FreeBSD

The git tests fail under FreeBSD libc's iconv.

* git: add sysctl check dependency on FreeBSD, same as Darwin
2024-07-21 05:41:53 +03:00
Thiago Kenji Okada
20e10bbc9e
gitFull: add patch to workaround gitk issue in Darwin (#325645)
Without this patch gitk just show an empty window.
2024-07-08 17:39:25 -04:00
John Garcia
53054089b2 git: 2.45.1 -> 2.45.2 2024-06-14 13:31:55 +01:00
John Garcia
21db1640cd git: update.sh fix grep warning 2024-06-14 13:31:55 +01:00
github-actions[bot]
668adff0d4
Merge master into staging-next 2024-06-09 12:01:06 +00:00
Audrey Dutcher
e2b4425c17 git: add uname_S make flag for freebsd cross
Otherwise, it takes the host uname -s value, which configures git
incorrectly.
2024-06-07 22:02:42 -07:00
github-actions[bot]
c987c730bb
Merge master into staging-next 2024-06-03 00:02:20 +00:00
Adam Dinwoodie
559bffb2cb git: correct update script
Commit d994dabace (treewide: remove git-and-tools directory, 2022-12-19)
removed the git-and-tools subdirectory, which the Git update script
still referred to.  Correct that outdated reference.
2024-05-23 12:43:44 +01:00
John Titor
f3692ef627
git: add passthru.update script 2024-05-17 20:06:12 +05:30
John Titor
93fa717087
git: 2.44.1 -> 2.45.1
Fixes  CVE-2024-32002, CVE-2024-32004, CVE-2024-32020,
CVE-2024-32021 and CVE-2024-32465
https://github.com/git/git/blob/v2.45.1/Documentation/RelNotes/2.45.1.txt
2024-05-17 20:06:06 +05:30
edef
3130575f4f git: 2.44.0 -> 2.44.1
CVE-2024-32002, CVE-2024-32004, CVE-2024-32465, CVE-2024-32020,
CVE-2024-32021
2024-05-15 00:54:37 +00:00
Sandro Jäckel
913a1d439c
git: use easier string concatenation instead of inlining things 2024-02-26 11:56:42 +01:00
Sandro Jäckel
150cd0ab61
git: disable completion test all the time, as it is now failing even on x86-64_linux 2024-02-26 11:56:11 +01:00
Muhammad Falak R Wani
a34621a5ba
git: 2.43.2 -> 2.44.0
Changelog: https://github.com/git/git/blob/v2.44.0/Documentation/RelNotes/2.44.0.txt
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
2024-02-26 11:40:17 +01:00
Sergei Trofimovich
03a4c73920 git: 2.43.1 -> 2.43.2
Changes: https://lore.kernel.org/lkml/xmqqil2rvu15.fsf@gitster.g/T/
2024-02-21 22:06:51 +00:00
R. Ryantm
917b380361 git: 2.43.0 -> 2.43.1 2024-02-10 05:27:32 +00:00
Muhammad Falak R Wani
41fe9efd4f git: 2.42.0 -> 2.43.0
Changelog: https://github.com/git/git/blob/v2.43.0/Documentation/RelNotes/2.43.0.txt
2023-12-03 10:06:07 +05:30
kashw2
9124084e5a git: added kashw2 maintainer 2023-08-22 20:26:21 +10:00
kashw2
6311609557 git: 2.41.0 -> 2.42.0 2023-08-22 20:26:21 +10:00
Adam Stephens
a07dbc1e45
git: add meta.mainProgram 2023-08-09 17:08:42 -04:00
zowoq
fc5804e55d git: 2.40.1 -> 2.41.0
Changelog: https://github.com/git/git/blob/v2.41.0/Documentation/RelNotes/2.41.0.txt
2023-06-06 11:24:01 +10:00
Sandro
cc8e3e9c1f
Merge pull request #229540 from ShamrockLee/git-fix-ls
Revert #224474, git completion command patching
2023-05-08 22:01:21 +02:00
Robert Scott
dd4c9eec90 git: fix installCheck on darwin
these days it wants `sysctl`
2023-05-06 15:18:28 +01:00
Yueh-Shun Li
b03cc9ce11 Revert "git: also patch the ls command for git-core scripts"
Prevent the command patching from breaking the definition of
__git_complete_revlist_file, where there's a local varible named "ls"

This reverts commit 820dc2a560.
2023-05-03 13:40:35 +00:00
Yueh-Shun Li
668b20d59d Revert "git: fix in completion scripts references to environment utils"
"git grep" (__gitcomp_builtin grep) is not grep,
and thus cannot be substituted by the GNU grep binary.

The command patching needs to be done with special care,
which includes manual examination of the diff result before and after patching.

This reverts commit b5d052d438.
2023-05-03 13:03:01 +00:00
zowoq
062d01a965 git: 2.40.0 -> 2.40.1
Changelog: https://github.com/git/git/blob/v2.40.1/Documentation/RelNotes/2.40.1.txt
2023-04-26 09:36:45 +10:00
Vladimír Čunát
c12b53b19d
Merge #224474: git: patch in completion scripts references
...into staging
2023-04-16 09:22:37 +02:00
zowoq
e279eef0b3 git: 2.39.2 -> 2.40.0
Changelog: https://github.com/git/git/blob/v2.40.0/Documentation/RelNotes/2.40.0.txt
2023-04-16 09:39:05 +10:00
Yueh-Shun Li
b5d052d438 git: fix in completion scripts references to environment utils 2023-04-03 20:26:32 +08:00
Yueh-Shun Li
820dc2a560 git: also patch the ls command for git-core scripts 2023-03-13 00:25:32 +08:00
Alyssa Ross
ac34fdfd47 git: 2.39.1 -> 2.39.2
Fixes: CVE-2023-22490
Fixes: CVE-2023-23946
2023-02-14 21:03:08 +00:00
Fabián Heredia Montiel
f50df0ed93 git: 2.39.0 → 2.39.1
Advisories:

- https://github.blog/2023-01-17-git-security-vulnerabilities-announced-2/

CVEs:

- CVE-2022-23521
- CVE-2022-41903
- CVE-2022-41953
2023-01-17 15:28:05 -06:00
Andreas Rammhold
37a44b41fc
git: set reasonable default features
Git should come with a reasonable set of baseline features. Arguable
git-send-email is one of them. Development flows, such as those of
Linux, depend on the tool being available.

The difference in closure size between this and the previous version
is is negligible. There are no additional build-time dependencies
pulled in and the runtime closure difference is about 1%.
2022-12-26 18:24:32 +01:00
zowoq
69ba914b99 git: 2.38.1 -> 2.39.0
Changelog: https://github.com/git/git/blob/v2.39.0/Documentation/RelNotes/2.39.0.txt
2022-12-26 16:11:14 +10:00
AndersonTorres
d994dabace treewide: remove git-and-tools directory
We do not use a "plugin system" for Git addons anymore, and therefore this
directory is no longer useful. Indeed that directory is way more confusing,
given that it includes more than mere Git addons, going from Bitbucket server
command-line tools to complete rewrites of Git in exotic programming languages.

Also, without this directory, the mental load of decision-making reduces a lot.
When anyone is interested in including a new git-related tool, just put it into
pkgs/applications/version-management, without apologies.
2022-12-19 15:05:22 -03:00
Marc Weber
0ad62a0edb adding gitAttr
now containing qgit, stgit, topGit, hg2git
updating gitGit (git dev version), adding qgit-git (dev version)

svn path=/nixpkgs/trunk/; revision=13816
2009-01-20 22:15:42 +00:00
Andres Löh
4d5c788b81 Removed broken quotes.
svn path=/nixpkgs/trunk/; revision=13761
2009-01-13 16:36:47 +00:00
Ludovic Courtès
a9f0680f77 Git 1.6.0.4.
svn path=/nixpkgs/trunk/; revision=13529
2008-12-01 10:24:24 +00:00
Ludovic Courtès
cd3f1ecd82 Git 1.6.0.3.
svn path=/nixpkgs/trunk/; revision=13222
2008-11-07 13:45:46 +00:00
Peter Simons
b4da0ccf16 git: updated from 1.6.0.1 to 1.6.0.2
svn path=/nixpkgs/trunk/; revision=13080
2008-10-16 12:41:46 +00:00
Ludovic Courtès
6f2086ec0e Git 1.6.0.1.
svn path=/nixpkgs/trunk/; revision=12800
2008-09-04 19:52:27 +00:00