Commit Graph

5229 Commits

Author SHA1 Message Date
Ryan Mulligan
5d015eadf0
Merge pull request #169516 from r-ryantm/auto-update/gitRepo
gitRepo: 2.23 -> 2.24
2022-04-21 19:53:58 -07:00
github-actions[bot]
46f11e0147
Merge staging-next into staging 2022-04-22 00:02:43 +00:00
Sandro Jäckel
319d22ab46
git-crypt: 0.6.0 -> 0.7.0 2022-04-22 01:38:19 +02:00
Sandro Jäckel
f83b8f10b8
git-crypt: adopt 2022-04-22 01:37:13 +02:00
R. Ryantm
41a2be8dc8 gitRepo: 2.23 -> 2.24 2022-04-21 03:03:41 +00:00
techknowlogick
7f03674b29 gitea: 1.16.5 -> 1.16.6 2022-04-20 21:00:44 -04:00
Christian Luetke Stetzkamp
cd8f1c2f11 rcs: cleanup remove unecessary input 2022-04-20 08:52:13 +02:00
Christian Luetke Stetzkamp
a8d61ae530 Revert "rcs: fix build w/glibc-2.34"
This reverts commit 96418eb0e7.

Patch is not needed anymore.
2022-04-19 11:23:46 +02:00
R. Ryantm
e76dad1a77 git-review: 2.2.0 -> 2.3.0 2022-04-19 03:15:47 +00:00
techknowlogick
1ea980a082 git: 2.35.3 -> 2.36.0 2022-04-18 15:02:36 -04:00
github-actions[bot]
40f288fa90
Merge master into staging-next 2022-04-15 18:01:30 +00:00
Daniel Nagy
ac83e58d62
glab: install shell completions (#168166)
* glab: install shell completions

* Update pkgs/applications/version-management/git-and-tools/glab/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-04-15 19:15:34 +02:00
Martin Weinelt
a7fc5aaa76 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-15 13:30:48 +02:00
Lassulus
92734ac395
Merge pull request #166865 from malob/treewide-mainProgram
treewide: add meta.mainProgram to many packages
2022-04-15 09:28:00 +01:00
Fabián Heredia Montiel
cb4a8b71c0 pijul: 1.0.0-beta → 1.0.0-beta.1 2022-04-15 00:25:09 -05:00
github-actions[bot]
1c0229dbfd
Merge staging-next into staging 2022-04-15 00:03:21 +00:00
Artturi
82c41765d3
Merge pull request #168652 from rhoriguchi/gitkraken
gitkraken: 8.3.3 -> 8.4.0
2022-04-14 23:55:28 +03:00
Ryan Horiguchi
e32344a937
gitkraken: 8.3.3 -> 8.4.0 2022-04-14 19:55:37 +02:00
Malo Bourgon
0e802eafad treewide: add meta.mainProgram to many packages 2022-04-14 10:24:01 -07:00
Martin Weinelt
329623c04f
Merge pull request #168581 from qowoz/git
git: 2.35.2 -> 2.35.3
2022-04-14 16:20:28 +02:00
github-actions[bot]
999a16ca63
Merge staging-next into staging 2022-04-14 12:02:14 +00:00
Mario Rodas
0d2ac5b4ea
Merge pull request #168582 from r-ryantm/auto-update/git-machete
git-machete: 3.7.2 -> 3.8.0
2022-04-14 05:03:21 -05:00
Mario Rodas
ed2962bb93
Merge pull request #168583 from r-ryantm/auto-update/gitRepo
gitRepo: 2.22 -> 2.23
2022-04-14 05:00:25 -05:00
Vladimír Čunát
d5d94127fd
Merge branch 'staging-next' into staging
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
2022-04-14 09:53:21 +02:00
R. Ryantm
7c63c5914d gitRepo: 2.22 -> 2.23 2022-04-14 03:39:09 +00:00
zowoq
5d520171ef git: 2.35.2 -> 2.35.3
https://lore.kernel.org/git/xmqq1qy04iqa.fsf@gitster.g/T/#u
2022-04-14 13:33:57 +10:00
R. Ryantm
b6f2d3588c git-machete: 3.7.2 -> 3.8.0 2022-04-14 03:33:41 +00:00
Naïm Favier
6826bc67ff gh: 2.7.0 -> 2.8.0
https://github.com/cli/cli/releases/tag/v2.8.0
2022-04-14 07:40:00 +10:00
Vladimír Čunát
7186bdfcf9
Merge #168412: git: 2.35.1 -> 2.35.2 (into staging) 2022-04-13 20:22:26 +02:00
Sandro Jäckel
cae8d1a2ed
git: only hardcode path to ssh binary on full build
Requirement for #146702
2022-04-13 15:18:50 +02:00
Martin Weinelt
c6eee6386d
subversion_1_10: 1.10.7 -> 1.10.8
https://svn.apache.org/repos/asf/subversion/tags/1.10.8/CHANGES
https://subversion.apache.org/security/CVE-2021-28544-advisory.txt
https://subversion.apache.org/security/CVE-2022-24070-advisory.txt

Fixes: CVE-2021-28544, CVE-2022-24070
2022-04-13 03:45:18 +02:00
Martin Weinelt
8f43f3dc40
subversion: 1.14.1 -> 1.14.2
https://svn.apache.org/repos/asf/subversion/tags/1.14.2/CHANGES
https://subversion.apache.org/security/CVE-2021-28544-advisory.txt
https://subversion.apache.org/security/CVE-2022-24070-advisory.txt

Fixes: CVE-2021-28544, CVE-2022-24070
2022-04-13 03:32:59 +02:00
Martin Weinelt
c875467fa2
git: 2.35.1 -> 2.35.2
https://lore.kernel.org/git/xmqqv8veb5i6.fsf@gitster.g/

Fixes: CVE-2022-24765
2022-04-12 23:51:54 +02:00
Artturi
eb8c2ad6b6
Merge pull request #153908 from jonringer/fix-p4
p4.src: fix sha256
2022-04-12 15:40:51 +03:00
Sandro Jäckel
a26c5495cd
git: add reasonable defaults for boolean flags 2022-04-12 00:58:51 +02:00
Vladimír Čunát
5e845236f2
Merge branch 'staging-next' into staging 2022-04-10 17:11:36 +02:00
Pascal Bach
49cc8715be
Merge pull request #167988 from aaronjheng/git-sizer
git-sizer: 1.3.0 -> 1.5.0
2022-04-10 09:27:06 +02:00
github-actions[bot]
55db28db36
Merge staging-next into staging 2022-04-09 18:01:56 +00:00
Bobby Rong
71e504ff21
scmpuff: remove unnecessary platforms
See #153464, for buildGoModule this should only be set if the package doesn't work with the default platforms.
2022-04-09 22:37:23 +08:00
Aaron Jheng
ffaa19174e
git-sizer: 1.3.0 -> 1.5.0 2022-04-09 12:25:47 +00:00
Aaron Jheng
56f79db0ba
scmpuff: 0.3.0 -> 0.5.0 2022-04-09 09:34:26 +00:00
github-actions[bot]
01b0aa0bc6
Merge staging-next into staging 2022-04-09 06:01:47 +00:00
Mario Rodas
bcef23547a
Merge pull request #167910 from hmenke/git-branchless
git-branchless: 0.3.10 -> 0.3.12
2022-04-08 20:37:17 -05:00
Travis A. Everett
368346c5a1 resholve: track API update in dependent packages 2022-04-08 21:13:20 -04:00
Henri Menke
5e40bd3313
git-branchless: 0.3.10 -> 0.3.12 2022-04-08 20:19:54 +02:00
Martin Weinelt
cc774b5792 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-07 12:12:57 +02:00
Lassulus
2bd4c44257
Merge pull request #164960 from r-ryantm/auto-update/ghorg
ghorg: 1.7.11 -> 1.7.12
2022-04-06 21:23:05 +01:00
Felix Buehler
7eb1a32324 subversion-client: remove appendToName to have a consistent package name for repology 2022-04-06 17:40:39 +02:00
github-actions[bot]
3dc8bd98b9
Merge staging-next into staging 2022-04-06 00:02:41 +00:00
Vladimír Čunát
b4729bad3d
Merge #165406: staging-next 2022-03-23 2022-04-05 20:34:08 +02:00
techknowlogick
3aeaa2755d mercurial: 6.1 -> 6.1.1 2022-04-05 12:06:24 -04:00
Ryan Mulligan
1a9c9dfd21
Merge pull request #167212 from r-ryantm/auto-update/github-desktop
github-desktop: 2.9.9 -> 2.9.12
2022-04-05 07:29:39 -07:00
Sandro
b28f082e3f
Merge pull request #167035 from nagy/hut-010 2022-04-05 14:10:38 +02:00
Martin Weinelt
bf1914e12a Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-05 04:05:02 +02:00
github-actions[bot]
120925b5cb
Merge master into staging-next 2022-04-05 00:02:06 +00:00
Lassulus
eeeac2fbf8
Merge pull request #164972 from r-ryantm/auto-update/gogs
gogs: 0.12.5 -> 0.12.6
2022-04-04 21:29:03 +01:00
R. Ryantm
3b072124a4 github-desktop: 2.9.9 -> 2.9.12 2022-04-04 17:52:03 +00:00
Martin Weinelt
f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
github-actions[bot]
c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
ajs124
7fdc84763a git-dit: remove after being marked broken for over two years
It was marked in commit 68a64b2afe by Benjamin Hipple on 2020-03-07 (commited on 2020-03-12)
2022-04-03 16:14:14 +01:00
ajs124
e4d66b08e9 bitkeeper: remove after being marked broken for over two years
It was marked in commit e04772230b by Franz Pletz on 2017-08-27 (commited on 2017-08-28)
2022-04-03 16:14:12 +01:00
Daniel Nagy
994627c44d
hut: unstable-2022-03-02 -> 0.1.0 2022-04-03 14:45:09 +02:00
github-actions[bot]
ffa96ab0c0
Merge staging-next into staging 2022-04-02 18:01:37 +00:00
github-actions[bot]
fc17fe6417
Merge master into staging-next 2022-04-02 18:01:07 +00:00
Alyssa Ross
8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/libraries/zlib/default.nix
	pkgs/development/lua-modules/overrides.nix
2022-04-02 16:45:48 +00:00
7c6f434c
8188f10752
Merge pull request #166430 from alyssais/openssl-static-retry
treewide: use lib.getLib for OpenSSL libraries
2022-04-02 12:59:55 +00:00
github-actions[bot]
fd5d77aa66
Merge master into staging-next 2022-04-02 06:01:21 +00:00
R. Ryantm
2c724274f8 verco: 6.7.0 -> 6.8.0 2022-04-01 22:33:48 -04:00
github-actions[bot]
8b4f11bb87
Merge master into staging-next 2022-04-02 00:02:09 +00:00
Martin Weinelt
3b2051594b
gitlab: 14.9.1 -> 14.9.2
https://about.gitlab.com/releases/2022/03/31/critical-security-release-gitlab-14-9-2-released/

Fixes: CVE-2022-1162, CVE-2022-1175, CVE-2022-1190, CVE-2022-1185,
       CVE-2022-1148, CVE-2022-1121, CVE-2022-1120, CVE-2022-1100,
       CVE-2022-1193, CVE-2022-1105, CVE-2022-1099, CVE-2022-1174,
       CVE-2022-1188, CVE-2022-0740, CVE-2022-1189, CVE-2022-1157,
       CVE-2022-1111
2022-04-01 22:37:12 +02:00
github-actions[bot]
9aa014c46a
Merge staging-next into staging 2022-03-31 12:02:10 +00:00
Alyssa Ross
ac5a927919
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/python-modules/einops/default.nix
	pkgs/development/python-modules/elegy/default.nix
2022-03-31 11:46:46 +00:00
Alyssa Ross
22c23dbb8d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/google-auth-oauthlib/default.nix
2022-03-31 11:42:24 +00:00
Ben Siraphob
5187709ff7
Merge pull request #166508 from siraben/automake-buildinputs 2022-03-31 03:15:41 -05:00
Martin Weinelt
d0bfb3ccbb Merge remote-tracking branch 'origin/master' into staging-next 2022-03-31 03:49:37 +02:00
Ben Siraphob
21faf9fc29
treewide: move autoconf, automake to nativeBuildInputs 2022-03-30 20:17:24 -05:00
zowoq
0a2ae8bc53 gh: 2.6.0 -> 2.7.0
https://github.com/cli/cli/releases/tag/v2.7.0
2022-03-31 06:35:33 +10:00
Alyssa Ross
fd78240ac8
treewide: use lib.getLib for OpenSSL libraries
At some point, I'd like to make another attempt at
71f1f4884b ("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07d.  One problem with my previous attempt is
that I moved OpenSSL's libraries to a lib output, but many dependent
packages were hardcoding the out output as the location of the
libraries.  This patch fixes every such case I could find in the tree.
It won't have any effect immediately, but will mean these packages
will automatically use an OpenSSL lib output if it is reintroduced in
future.

This patch should cause very few rebuilds, because it shouldn't make
any change at all to most packages I'm touching.  The few rebuilds
that are introduced come from when I've changed a package builder not
to use variable names like openssl.out in scripts / substitution
patterns, which would be confusing since they don't hardcode the
output any more.

I started by making the following global replacements:

    ${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib
    ${openssl.out}/lib -> ${lib.getLib openssl}/lib

Then I removed the ".out" suffix when part of the argument to
lib.makeLibraryPath, since that function uses lib.getLib internally.

Then I fixed up cases where openssl was part of the -L flag to the
compiler/linker, since that unambigously is referring to libraries.

Then I manually investigated and fixed the following packages:

 - pycurl
 - citrix-workspace
 - ppp
 - wraith
 - unbound
 - gambit
 - acl2

I'm reasonably confindent in my fixes for all of them.

For acl2, since the openssl library paths are manually provided above
anyway, I don't think openssl is required separately as a build input
at all.  Removing it doesn't make a difference to the output size, the
file list, or the closure.

I've tested evaluation with the OfBorg meta checks, to protect against
introducing evaluation failures.
2022-03-30 15:10:00 +00:00
Fabian Affolter
732d35fbf0
Merge pull request #162505 from cfhammill/cfh/fix-dvc-daemon-patch_157998
fix: dvc daemon patch, instantiate env to a copy of os.environ
2022-03-30 09:45:42 +02:00
Fabian Affolter
e09f9b78d1
Merge pull request #166346 from SuperSandro2000/dvc-with-remotes
dvc: 2.9.3 -> 2.9.5
2022-03-30 09:43:57 +02:00
Sandro Jäckel
40ded1611d
dvc: 2.9.3 -> 2.9.5 2022-03-30 02:59:44 +02:00
Sandro
94a2398ae2
Merge pull request #166116 from MinerSebas/update/smartgithg 2022-03-30 02:11:59 +02:00
Martin Weinelt
630d5e1d0d Merge remote-tracking branch 'origin/master' into staging-next 2022-03-29 18:17:36 +02:00
Frederik Rietdijk
25c014324b Merge master into staging-next 2022-03-29 13:25:16 +02:00
Felix Buehler
1913519071 darcs-to-git: switch to fetchFromGitHub 2022-03-29 13:06:47 +02:00
timothy
bb35948c1c
gerrit: 3.4.1 -> 3.5.1 (#166178) 2022-03-29 10:40:37 +02:00
cfhammill
c56400aa3e dvc: instantiate env to a copy of os.environ
this line removes the dvc utility fix_env which works around
pyenv (irrelevant for nix I think), fix_env instantiates env
as a copy of os.environ is its env argument is None, so I think
this behaviour is close to what the dvc authors intended.
2022-03-28 20:09:35 -04:00
MinerSebas
f756e87ede smartgithg: 20.2.5 -> 21.2.2 2022-03-28 18:15:57 +02:00
Jan Tojnar
c8a5db3854 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/tools/archivers/rar/default.nix
2022-03-28 17:56:38 +02:00
Jan Tojnar
997bb5e42c Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/development/python-modules/dnspython/default.nix
;	pkgs/development/python-modules/googleapis-common-protos/default.nix
2022-03-28 17:55:31 +02:00
Jörg Thalheim
2a61b85e4b
Merge pull request #166013 from hmenke/git-branchless
git-branchless: 0.3.9 -> 0.3.10
2022-03-28 12:53:16 +01:00
Sandro
2f1e03cb2b
Merge pull request #165691 from lucc/github-removed-unencrypted-git 2022-03-28 12:47:42 +02:00
Yaya
7d1a55bdfb
gitlab: 14.8.4 -> 14.9.1 (#165309) 2022-03-28 11:11:17 +02:00
Henri Menke
a39b29dd09
git-branchless: 0.3.9 -> 0.3.10 2022-03-27 23:39:51 +00:00
wahjava
353d271351
fnc: init at 0.10 (#165667)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-27 20:13:27 +02:00
github-actions[bot]
36198fe197
Merge staging-next into staging 2022-03-27 18:01:40 +00:00
Martin Weinelt
d68657af92 Merge remote-tracking branch 'origin/master' into staging-next 2022-03-27 15:54:05 +02:00
wahjava
63dd57021f
got: 0.67 -> 0.68.1 (#165415)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-27 15:15:07 +02:00
Alyssa Ross
4345b27ded git: enable debug info 2022-03-27 12:49:22 +00:00
github-actions[bot]
3b6f03e497
Merge master into staging-next 2022-03-26 18:01:22 +00:00