Vladimír Čunát 89023c38fc Recover the complicated situation after my bad merge ... I made a mistake merge. Reverting it in c778945806 undid the state on master, but now I realize it crippled the git merge mechanism. As the merge contained a mix of commits from `master..staging-next` and other commits from `staging-next..staging`, it got the `staging-next` branch into a state that was difficult to recover. I reconstructed the "desired" state of staging-next tree by: - checking out the last commit of the problematic range: 4effe769e2 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken merge commit and its revert from that range (while keeping reapplication from 4effe769e2) - merging the last unaffected staging-next commit (803ca85c20) - fortunately no other commits have been pushed to staging-next yet - applying a diff on staging-next to get it into that state		2020-10-26 09:01:04 +01:00
..
add-opengl-runpath
agda	agda: install literate files	2020-06-01 13:59:20 +01:00
alternatives	Merge pull request #92412 from matthewbauer/blas-cross	2020-08-15 08:55:57 +02:00
appimage	appimage: remove ancient gst dep	2020-09-02 02:24:07 +02:00
bintools-wrapper	Revert "utils.bash: revert #93560 for darwin, unblocks channels"	2020-09-06 18:16:14 +02:00
build-bazel-package	build-bazel-package: add dontAddBazelOpts arg	2020-08-28 15:10:59 -05:00
build-dotnet-package
build-fhs-userenv	*-wrapper; Switch from infixSalt to suffixSalt	2020-05-12 00:44:44 -04:00
build-fhs-userenv-bubblewrap	build-fhs-user-env-bubblewrap: consistent camelCase	2020-08-17 10:05:25 +02:00
build-setupcfg
buildenv	buildenv: paths to link resolving to the same absolute path is not a conflict	2020-06-10 06:42:48 -03:00
cc-wrapper	gnat: fix build	2020-09-19 20:54:27 -07:00
docker	dockerTools: add isExe to streamLayeredImage result	2020-10-05 10:48:17 +02:00
dotnetbuildhelpers	treewide: pkg-config has targetPrefix	2020-05-16 00:21:21 +00:00
dotnetenv	dotnetenv: editorconfig fixes	2020-09-21 08:30:58 +10:00
emacs	emacs: Add native builds for nativeComp enabled emacsen	2020-07-24 03:16:17 +02:00
expand-response-params
fetchbitbucket
fetchbower
fetchbzr	treewide: replace bazaar with breezy	2020-05-25 09:22:54 +02:00
fetchcvs
fetchdarcs
fetchdocker
fetchfossil
fetchgit	nix-prefetch-git: also add store path to json output	2020-05-04 17:43:29 +05:30
fetchgithub
fetchgitiles
fetchgitlab	fetchgitlab: Escape a few more characters in the revision	2020-09-13 12:34:08 +02:00
fetchgitlocal
fetchgx
fetchhg
fetchipfs
fetchmavenartifact	treewide: central.maven.org -> repo1.maven.org	2020-06-12 14:26:08 +00:00
fetchmtn
fetchnuget
fetchpatch	fetchpatch: Allow using base64-encoded hash	2020-03-02 23:57:40 +01:00
fetchrepoorcz
fetchrepoproject
fetchs3
fetchsavannah
fetchsvn	fetchsvn: Fix for cross	2020-03-09 02:11:45 -04:00
fetchsvnrevision
fetchsvnssh
fetchurl	Merge branch 'master' into fetchurl-no-hash	2020-07-06 14:40:49 -04:00
fetchzip	Revert "fetchzip, fetchgit: cleanup handling of optional features and whitespace"	2020-03-26 00:35:40 -04:00
icon-conv-tools
install-shell-files	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
kernel	makeModulesClosuse: read modules from corrent kernel version	2020-08-27 10:48:18 -07:00
libredirect	python3Packages.python-engineio: fix build w/glibc-2.32	2020-09-12 23:04:50 +02:00
make-desktopitem	make-desktopitem: name was being used instead of desktopName	2020-10-15 14:29:32 +02:00
make-startupitem
make-symlinks
mkshell
mono-dll-fixer
nix-gitignore
nuke-references
ocaml	ocamlPackages.buildOasis: fix handling of installation prefix	2020-07-02 07:13:34 +02:00
oci-tools
pkg-config-wrapper	Revert "utils.bash: also "fix" cc-wrapper and pkg-config-wrapper"	2020-09-07 16:31:59 +02:00
prefer-remote-fetch
references-by-popularity
release	nixos/testing: remove remaining coverage-data logic	2020-09-05 16:07:59 +02:00
remove-references-to
rust	buildRustCrateTests: support cross-compilation	2020-09-29 14:33:49 -04:00
setup-hooks	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
singularity-tools	Merge pull request #93082 from cfhammill/cfh/fix-singularity-shell-copy	2020-09-19 00:42:29 -03:00
skaware	skawarePackages.cleanPackaging: copy docFiles before rm noise	2020-05-21 19:46:38 +02:00
snap
src-only	srcOnly: rename buildInputs to nativeBuildInputs	2020-04-27 14:31:40 +02:00
substitute
substitute-files
templaterpm
upstream-updater
vm	Merge pull request #82258 from erikarvstedt/fix-xchg-caching	2020-06-01 22:34:48 +02:00
wrapper-common	Merge #97597: stdenv wrappers: improve purity checking	2020-09-24 10:58:10 +02:00
writers	pkgs/build-support/writers: allow passing ghc arguments in writeHaskell	2020-09-07 19:36:58 +02:00
build-maven.nix
build-pecl.nix	php.buildPecl: Allow PECLs to depend on other PECLs	2020-05-09 23:38:21 +02:00
closure-info.nix
dhall-to-nix.nix
plugins.nix
replace-dependency.nix
setup-systemd-units.nix
source-from-head-fun.nix
trivial-builders.nix	nixos/systemd.tmpfiles.packages: fix an edge case	2020-08-16 10:23:53 +02:00