Naïm Favier
d2990717f1
CONTRIBUTING.md: simplify rebasing instructions
...
Makes the instructions easier to remember (and type) using the
`git rebase --onto A...B` syntax to find the merge base between A and B
(which has been in git for at least 10 years).
We also assume that the merge base between staging and master is also
the merge base between staging and the current branch (since it is based
on master), and giving master as the <upstream> branch makes git
consider the commits in the current branch that are not in master, so
there's no need to compute the merge base between master and the current
branch.
In the same spirit of discouraging copy-and-paste, use a placeholder
name for the current branch instead of `$(git branch --show-current)`.
2022-05-29 22:10:47 +02:00
Jeremy Kolb and GitHub
e37248668b
open-vm-tools: 12.0.0 -> 12.0.5 ( #174744 )
...
* open-vm-tools: 12.0.0 -> 12.0.5
* remove unused fetchpatch
2022-05-29 19:49:26 +02:00
Sandro and GitHub
7b2f132ad5
Merge pull request #174811 from emmabastas/master
...
spectre-cli: init at unstable-2022-02-05
2022-05-29 19:46:12 +02:00
Thiago Kenji Okada and GitHub
0a382c5c94
Merge pull request #175302 from AtilaSaraiva/distrobox
...
distrobox: 1.2.15 -> 1.3.0
2022-05-29 18:33:15 +01:00
Ben Siraphob and GitHub
d2352c9108
Merge pull request #172187 from loicreynier/init-gh-cal
2022-05-29 17:32:59 +00:00
Vladimír Čunát
b62ada4305
Merge #175305 : glibc_multi: match output ordering of glibc
...
In particular this fixes the build of virtualbox again.
2022-05-29 19:24:39 +02:00
Will Dietz and GitHub
bc6116b23f
firrtl: init at 1.5.3 ( #171065 )
2022-05-29 12:19:51 -05:00
maralorn and GitHub
b571ef8fcb
Merge pull request #173800 from NixOS/haskell-updates
...
haskellPackages: update stackage and hackage
2022-05-29 19:12:29 +02:00
Malte Brandy
9138527da7
Merge branch 'master' into haskell-updates
2022-05-29 19:01:15 +02:00
Malte Brandy
1563974b36
haskellPackages: mark builds failing on hydra as broken
...
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
2022-05-29 18:58:20 +02:00
Artturin
513b7f1010
glibc_multi: match output ordering of glibc
...
glibc has an exception in that 'out' is the default output instead of 'bin'
it should be matched here for consistency
2022-05-29 19:54:32 +03:00
Sandro and GitHub
01c1bb59d0
Merge pull request #175147 from SuperSandro2000/bottles
2022-05-29 18:51:43 +02:00
Sandro and GitHub
55c742cabe
Merge pull request #174933 from LeSuisse/zlog-CVE-2021-43521
2022-05-29 18:50:48 +02:00
7c6f434c and GitHub
093bf95532
Merge pull request #175180 from fabaff/atop-bump
...
atop: 2.6.0 -> 2.7.1
2022-05-29 16:50:33 +00:00
Sandro and GitHub
07417883c2
Merge pull request #175195 from SuperSandro2000/topgrade
...
topgrade: 9.0.0 -> 9.0.1
2022-05-29 18:48:54 +02:00
Mario Rodas and GitHub
ceaa65cb04
Merge pull request #175239 from marsam/update-contour
...
contour: 0.1.1 -> 0.3.1.200
2022-05-29 11:28:01 -05:00
Sergei Trofimovich and GitHub
589f44ba06
Merge pull request #173855 from trofi/fix-fno-common-for-glabels
...
glabels: pull fix pending upstream inclusion for -fno-common toolchai…
2022-05-29 16:01:54 +00:00
Sergei Trofimovich and GitHub
c2eb1202cc
Merge pull request #173852 from trofi/workaround-fno-common-for-foremost
...
foremost: add -fcommon workaround
2022-05-29 16:01:32 +00:00
Sergei Trofimovich and GitHub
5580257e0e
Merge pull request #173725 from trofi/workaround-fno-common-for-dspam
...
dspam: add -fcommon workaround
2022-05-29 16:01:04 +00:00
Sergei Trofimovich and GitHub
c2934244fc
Merge pull request #173716 from trofi/workaround-fno-common-for-dirb
...
dirb: add -fcommon workaround
2022-05-29 15:59:30 +00:00
Sergei Trofimovich and GitHub
59df0efd22
Merge pull request #173714 from trofi/fix-tbb-for-gcc-13
...
tbb: pull fix pending upstream inclusion for gcc-13 support
2022-05-29 15:54:06 +00:00
Sergei Trofimovich and GitHub
53591dcd4d
Merge pull request #173021 from trofi/fix-fno-common-for-gerbv
...
gerbv: pull fix pending upstream inclusion for -fno-common toolchains
2022-05-29 15:52:56 +00:00
Sergei Trofimovich and GitHub
4561c660ba
Merge pull request #173012 from trofi/fix-fno-common-for-mod_tile
...
apacheHttpdPackages.mod_tile: pull upstream fix for -fno-common
2022-05-29 15:52:06 +00:00
Sergei Trofimovich and GitHub
f6c4da4920
Merge pull request #173003 from trofi/update-foma-for-fno-common
...
foma: 0.9.18alpha -> 0.10.0alpha
2022-05-29 15:51:27 +00:00
Sergei Trofimovich and GitHub
64756b041d
Merge pull request #172992 from trofi/fix-fno-common-for-awesome
...
awesome: pull upstream fix for -fno-common toolchains
2022-05-29 15:51:06 +00:00
Alexander Bantyev and GitHub
7c59ac9ddc
Merge pull request #175177 from NixOS/fix-all-gcc10-packages
...
Fix packages broken by gcc 10->11 update
2022-05-29 19:39:46 +04:00
Alexander Bantyev
8a6dbc8b7d
yafaray-core: stdenv -> gcc10Stdenv
2022-05-29 19:04:13 +04:00
Alexander Bantyev
da31172e10
xqilla: stdenv -> gcc10Stdenv
2022-05-29 19:03:21 +04:00
Alexander Bantyev
a5739070a0
xc3sprog: stdenv -> gcc10Stdenv
2022-05-29 18:58:17 +04:00
Alexander Bantyev
1461ead834
wxcam: stdenv -> gcc10Stdenv
2022-05-29 18:57:26 +04:00
Alexander Bantyev
1affead2e6
webrtc-audio-processing_1: stdenv -> gcc10Stdenv
2022-05-29 18:56:35 +04:00
Alexander Bantyev
4281581f32
uri: stdenv -> gcc10Stdenv
2022-05-29 18:55:44 +04:00
Alexander Bantyev
101927cc46
ucg: stdenv -> gcc10Stdenv
2022-05-29 18:54:53 +04:00
Alexander Bantyev
17cca50520
tracebox: stdenv -> gcc10Stdenv
2022-05-29 18:54:03 +04:00
Alexander Bantyev
bb1a8a87a6
tiscamera: stdenv -> gcc10Stdenv
2022-05-29 18:53:11 +04:00
Alexander Bantyev
7bd4ef2835
textadept11: stdenv -> gcc10Stdenv
2022-05-29 18:52:20 +04:00
Alexander Bantyev
fe9163bac7
swiftshader: stdenv -> gcc10Stdenv
2022-05-29 18:51:21 +04:00
Alexander Bantyev
8c379ef34f
swfmill: stdenv -> gcc10Stdenv
2022-05-29 18:50:31 +04:00
Alexander Bantyev
70e3e0d839
stuntrally: stdenv -> gcc10Stdenv
2022-05-29 18:49:40 +04:00
Alexander Bantyev
38a3766228
strelka: stdenv -> gcc10Stdenv
2022-05-29 18:48:49 +04:00
Alexander Bantyev
c526e73ea2
spring: stdenv -> gcc10Stdenv
2022-05-29 18:47:58 +04:00
Alexander Bantyev
b9af2b5afd
sonic-lineup: stdenv -> gcc10Stdenv
2022-05-29 18:47:07 +04:00
Alexander Bantyev
91ef8a2d4e
rss-glx: stdenv -> gcc10Stdenv
2022-05-29 18:46:16 +04:00
Fabian Affolter and GitHub
956b1ccf51
Merge pull request #175293 from r-ryantm/auto-update/python310Packages.celery
...
python310Packages.celery: 5.2.6 -> 5.2.7
2022-05-29 16:42:40 +02:00
74e4125f18
spectre-cli: init at unstable-2021-02-05
...
Co-authored-by: FliegendeWurst <2012gdwu+github@posteo.de >
Co-authored-by: SuperSandro2000 <sandro.jaeckel@gmail.com >
2022-05-29 16:38:34 +02:00
emmabastas
57404f470a
maintainers: add emmabastas
2022-05-29 16:38:34 +02:00
Alexander Bantyev
8297eeacda
pktgen: stdenv -> gcc10Stdenv
2022-05-29 18:27:23 +04:00
Alexander Bantyev
533171bfff
pianobooster: stdenv -> gcc10Stdenv
2022-05-29 18:26:32 +04:00
Alexander Bantyev
0655723b23
percona-xtrabackup_8_0: stdenv -> gcc10Stdenv
2022-05-29 18:25:39 +04:00
Alexander Bantyev
5785f8321c
percona-xtrabackup_2_4: stdenv -> gcc10Stdenv
2022-05-29 18:24:50 +04:00
Naïm Favier