Commit Graph

7786 Commits

Author SHA1 Message Date
R. Ryantm
f58525e740 gh: 2.45.0 -> 2.46.0 2024-03-22 00:21:16 +10:00
github-actions[bot]
36232fff71
Merge master into staging-next 2024-03-20 18:01:02 +00:00
Jörg Thalheim
99bba48f3a
Merge pull request #297236 from r-ryantm/auto-update/commitizen
commitizen: 3.18.4 -> 3.20.0
2024-03-20 18:12:57 +01:00
github-actions[bot]
a474411771
Merge master into staging-next 2024-03-20 00:02:08 +00:00
Weijia Wang
509d2e8ed3
Merge pull request #296913 from wegank/radicle-upstream-broken
radicle-upstream: mark as broken on linux
2024-03-19 22:48:17 +01:00
R. Ryantm
3305de9cd0 commitizen: 3.18.4 -> 3.20.0 2024-03-19 17:34:30 +00:00
Martin Weinelt
7762462405
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/flask-security-too/default.nix
2024-03-19 17:30:16 +01:00
Yaya
c031ea4adc gitlab-container-registry: 3.88.0 -> 3.90.0
https://gitlab.com/gitlab-org/container-registry/-/blob/v3.90.0-gitlab/CHANGELOG.md
2024-03-19 13:47:55 +01:00
Yaya
135cf4f8f9 gitlab: 16.8.1 -> 16.9.2
https://gitlab.com/gitlab-org/gitlab/-/blob/v16.8.2-ee/CHANGELOG.md
https://gitlab.com/gitlab-org/gitlab/-/blob/v16.9.2-ee/CHANGELOG.md

Fixes CVE-2023-6386
Fixes CVE-2023-6840
Fixes CVE-2024-0199
Fixes CVE-2024-1066
Fixes CVE-2024-1250
Fixes CVE-2024-1299

Co-Authored-By: ajs124 <git@ajs124.de>
2024-03-19 13:47:55 +01:00
Martin Weinelt
3321e63b12
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/sphinx-autobuild/default.nix
2024-03-19 04:00:32 +01:00
stuebinm
ff1a94e523 treewide: add meta.mainProgram to packages with a single binary
The nixpkgs-unstable channel's programs.sqlite was used to identify
packages producing exactly one binary, and these automatically added
to their package definitions wherever possible.
2024-03-19 03:14:51 +01:00
Weijia Wang
87ddc18bc7 radicle-upstream: mark as broken on linux 2024-03-18 15:17:37 +01:00
github-actions[bot]
100b3bb178
Merge master into staging-next 2024-03-17 18:00:54 +00:00
Weijia Wang
14074d4094
Merge pull request #294150 from r-ryantm/auto-update/glab
glab: 1.36.0 -> 1.37.0
2024-03-17 15:24:17 +01:00
annalee
8ead81a60f
Merge remote-tracking branch 'upstream/master' into staging-next 2024-03-17 07:18:11 +00:00
Mario Rodas
25c03895b3
Merge pull request #296445 from mfrw/mfrw/delta-0.17.0
delta: 0.16.5 -> 0.17.0
2024-03-16 19:12:38 -05:00
github-actions[bot]
2178d8d857
Merge master into staging-next 2024-03-17 00:02:17 +00:00
Muhammad Falak R Wani
62f455f63a delta: 0.16.5 -> 0.17.0
Diff: https://github.com/dandavison/delta/compare/0.16.5...0.17.0
Changelog: https://github.com/dandavison/delta/releases/tag/0.17.0
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
2024-03-16 20:43:25 +05:30
R. Ryantm
33a595455f commitizen: 3.18.3 -> 3.18.4 2024-03-16 07:42:21 +00:00
github-actions[bot]
2bffd64e73
Merge master into staging-next 2024-03-15 00:01:59 +00:00
Jörg Thalheim
22d6f54966
Merge pull request #295940 from shanesveller/shanesveller/maintainer
maintainers: remove shanesveller
2024-03-14 19:08:43 +01:00
github-actions[bot]
c160165e60
Merge master into staging-next 2024-03-14 18:01:26 +00:00
Peder Bergebakken Sundt
22ec091a63
Merge pull request #295048 from afh/update-got
got: 0.96 -> 0.97
2024-03-14 18:35:34 +01:00
Shane Sveller
ea3c2e26d3
maintainers: remove shanesveller 2024-03-14 12:09:10 -05:00
Nick Cao
d0950d4cf9
Merge pull request #295725 from wegank/smartgithg-bump
smartgithg: 23.1.1 -> 23.1.2
2024-03-14 12:40:02 -04:00
sternenseemann
2b19e47c8b josh: 23.02.14 -> 23.12.04 2024-03-14 15:52:57 +01:00
Weijia Wang
3b421626dd smartgithg: move to pkgs/by-name 2024-03-13 23:11:19 +01:00
github-actions[bot]
f4c4bfc9fc
Merge master into staging-next 2024-03-13 18:00:53 +00:00
Maximilian Bosch
7355353390
Merge pull request #295574 from SuperSandro2000/gitea
gitea: 1.21.7 -> 1.21.8
2024-03-13 16:53:48 +00:00
Sandro Jäckel
6731001323
gitea: 1.21.7 -> 1.21.8
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.21.8
2024-03-13 11:16:44 +01:00
annalee
8e038835fe
Merge remote-tracking branch 'upstream/master' into staging-next 2024-03-13 00:38:07 +00:00
Martin Weinelt
20eae76661
Merge pull request #294305 from NixOS/python-updates
[python-updates] 2024/03/07 - major updates
2024-03-13 00:13:18 +01:00
Nick Cao
55bedaab73
Merge pull request #295276 from r-ryantm/auto-update/commitizen
commitizen: 3.18.0 -> 3.18.3
2024-03-12 14:56:47 -04:00
Nick Cao
755a9906c4
Merge pull request #295138 from r-ryantm/auto-update/git-machete
git-machete: 3.23.2 -> 3.24.2
2024-03-12 14:32:46 -04:00
Martin Weinelt
c6d2f1cc77 commitizen: test with pytest_7 2024-03-12 18:25:15 +01:00
github-actions[bot]
1cef2a1be7
Merge staging-next into staging 2024-03-12 12:01:40 +00:00
R. Ryantm
3b2b0ac604 commitizen: 3.18.0 -> 3.18.3 2024-03-12 10:38:33 +00:00
Vladimír Čunát
0c61a98037
Merge #291120: git: 2.43.2 -> 2.44.0
...into staging
2024-03-12 08:58:40 +01:00
Bob van der Linden
edb803836d git-cola: 4.5.0 -> 4.6.1 2024-03-12 08:27:28 +01:00
Bob van der Linden
dfa578dd22 git-cola: format file 2024-03-12 08:27:28 +01:00
R. Ryantm
382af40571 git-machete: 3.23.2 -> 3.24.2 2024-03-11 22:08:47 +00:00
Alexis Hildebrandt
4162c67999 got: 0.96 -> 0.97 2024-03-11 20:57:26 +01:00
a-n-n-a-l-e-e
ce789e7e35
llvmPackages_{12,13,14,15,16,17,git}.{libcxx,libcxxabi}: merge libcxxabi into libcxx (#292043)
- merge libcxxabi into libcxx for LLVM 12, 13, 14, 15, 16, 17, and git.
- remove the link time workaround `-lc++ -lc++abi` from 58 packages as it is no longer required.
- fixes https://github.com/NixOS/nixpkgs/issues/166205
- provides alternative fixes for. https://github.com/NixOS/nixpkgs/issues/269548 https://github.com/NixOS/nix/issues/9640
- pkgsCross.x86_64-freebsd builds work again

This change can be represented in 3 stages
1. merge libcxxabi into libcxx -- files: pkgs/development/compilers/llvm/[12, git]/{libcxx, libcxxabi}
2. update stdenv to account for merge -- files: stdenv.{adapters, cc.wrapper, darwin}
3. remove all references to libcxxabi outside of llvm (about 58 packages modified)

### merging libcxxabi into libcxx
- take the union of the libcxxabi and libcxx cmake flags
- eliminate the libcxx-headers-only package - it was only needed to break libcxx <-> libcxxabi circular dependency
- libcxx.cxxabi is removed. external cxxabi (freebsd) will symlink headers / libs into libcxx.
- darwin will re-export the libcxxabi symbols into libcxx so linking `-lc++` is sufficient.
- linux/freebsd `libc++.so` is a linker script `LINK(libc++.so.1, -lc++abi)` making `-lc++` sufficient.
- libcxx/default.nix [12, 17] are identical except for patches and `LIBCXX_ADDITIONAL_LIBRARIES` (only used in 16+)
- git/libcxx/defaul.nix  does not link with -nostdlib when useLLVM is true so flag is removed. this is not much different than before as libcxxabi used -nostdlib where libcxx did not, so libc was linked in anyway.

### stdenv changes
- darwin bootstrap, remove references to libcxxabi and cxxabi
- cc-wrapper: remove c++ link workaround when libcxx.cxxabi doesn't exist (still exists for LLVM pre 12)
- adapter: update overrideLibcxx to account for a pkgs.stdenv that only has libcxx

### 58 package updates
- remove `NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}` as no longer needed
- swift, nodejs_v8 remove libcxxabi references in the clang override

https://github.com/NixOS/nixpkgs/pull/292043
2024-03-11 03:53:37 -07:00
Adam Stephens
672879b3c0 jujutsu: 0.14.0 -> 0.15.1
Diff: https://github.com/martinvonz/jj/compare/v0.14.0...v0.15.1

Changelog: https://github.com/martinvonz/jj/blob/v0.15.1/CHANGELOG.md
2024-03-10 12:58:45 -05:00
Sandro
c86e8fd7a0
Merge pull request #133542 from fpletz/refactor/pinentry-remove-multiple-outputs
pinentry: remove multiple outputs
2024-03-09 23:57:27 +01:00
Franz Pletz
a270c43ea1
treewide: use sensible pinentry flavor 2024-03-08 23:09:02 +01:00
Nick Cao
5b12ccd8f6
Merge pull request #294129 from r-ryantm/auto-update/commitizen
commitizen: 3.16.0 -> 3.18.0
2024-03-08 10:20:27 -05:00
Mario Rodas
bd04b7da3e
Merge pull request #294156 from marsam/update-git-lfs
git-lfs: 3.5.0 -> 3.5.1
2024-03-08 09:04:24 -05:00
Vladimír Čunát
335c734226
Merge #292500: staging-next 2024-03-01 2024-03-08 12:35:06 +01:00
R. Ryantm
c06519879b glab: 1.36.0 -> 1.37.0 2024-03-08 00:16:08 +00:00