nixos/nixpkgs - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Expand)	Author	Age	Files	Lines
*	Revert "chromiumDev: 97.0.4692.20 -> 98.0.4710.4"origin/revert-146768-chromiumDev	Michael Weiss	2021-11-20	2	-6/+41
*	Merge pull request #146768 from primeos/chromiumDev•••chromiumDev: 97.0.4692.20 -> 98.0.4710.4	Michael Weiss	2021-11-20	2	-41/+6
\|\
\| *	chromiumDev: 97.0.4692.20 -> 98.0.4710.4	Michael Weiss	2021-11-20	2	-41/+6
* \|	Merge pull request #146547 from AndersonTorres/new-gistyc•••gistyc: add tests	Anderson Torres	2021-11-20	1	-0/+4
\|\ \
\| * \|	gistyc: add tests	AndersonTorres	2021-11-18	1	-0/+4
* \| \|	Merge pull request #145052 from oxzi/openrct2-0.3.5•••openrct2: 0.3.4.1 -> 0.3.5	Guillaume Girol	2021-11-20	1	-6/+20
\|\ \ \
\| * \| \|	openrct2: 0.3.4.1 -> 0.3.5•••Next to the version bump, some hints for maintainers to select the right version of the other modules were added.	Alvar Penning	2021-11-08	1	-6/+20
* \| \| \|	Merge pull request #146764 from fabaff/bump-restrictedpython•••python3Packages.restrictedpython: 5.1 -> 5.2	Kira Bruneau	2021-11-20	1	-17/+17
\|\ \ \ \
\| * \| \| \|	python3Packages.restrictedpython: 5.1 -> 5.2	Fabian Affolter	2021-11-20	1	-17/+17
* \| \| \| \|	Merge pull request #146677 from NixOS/home-assistant•••home-assistant: 2021.11.4 -> 2021.11.5	Fabian Affolter	2021-11-20	2	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	home-assistant: 2021.11.4 -> 2021.11.5	Martin Weinelt	2021-11-19	2	-3/+3
* \| \| \| \| \|	Merge pull request #146678 from primeos/chromiumBeta•••chromiumBeta: 96.0.4664.45 -> 97.0.4692.20	Michael Weiss	2021-11-20	1	-6/+6
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	chromiumBeta: 96.0.4664.45 -> 97.0.4692.20	Michael Weiss	2021-11-19	1	-6/+6
* \| \| \| \| \|	Merge pull request #146244 from pimeys/prisma-3.5.0•••prisma: 3.4.0 -> 3.5.0	Guillaume Girol	2021-11-20	2	-7/+7
\|\ \ \ \ \ \
\| * \| \| \| \| \|	prisma: 3.4.0 -> 3.5.0	Julius de Bruijn	2021-11-16	2	-7/+7
* \| \| \| \| \| \|	Merge pull request #146129 from gbtb/rocketchat-desktop_wrapGAppsHook•••rocketchat-desktop: added wrapGAppsHook, 3.5.7 -> 3.6.0	Guillaume Girol	2021-11-20	1	-3/+7
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	rocketchat-desktop: 3.5.7 -> 3.6.0	gbtb	2021-11-17	1	-2/+3
\| * \| \| \| \| \| \|	Merge branch 'NixOS:master' into rocketchat-desktop_wrapGAppsHook	gbtb	2021-11-17	413	-4423/+8860
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	rocketchat-desktop: added wrapGAppsHook	gbtb	2021-11-15	1	-1/+4
* \| \| \| \| \| \| \| \|	Merge #146037: cxxtools: fix build on aarch64	Vladimír Čunát	2021-11-20	1	-0/+2
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	cxxtools: fix build on aarch64•••fix gleaned from opensuse package	Robert Scott	2021-11-14	1	-0/+2
* \| \| \| \| \| \| \| \| \|	Merge #145974: unicorn: fix build on aarch64 + py checks	Vladimír Čunát	2021-11-20	2	-9/+20
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	python3Packages.unicorn: fix build on aarch64	Robert Scott	2021-11-17	1	-7/+7
\| * \| \| \| \| \| \| \| \| \|	python3Packages.unicorn: add custom checkPhase	Robert Scott	2021-11-17	2	-7/+18
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #146524 from igsha/master•••fetchgitlab: fix unexpected argument	Janne Heß	2021-11-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	fetchgitlab: fix unexpected argument	Igor Sharonov	2021-11-18	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \|	Merge #144935: llvmPackages_7.libcxxabi: fix build with gcc	Vladimír Čunát	2021-11-20	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	llvmPackages_7.libcxxabi: fix build with gcc•••Unblocks 17 dependers on aarch64-linux	Ryan Burns	2021-11-06	1	-0/+8
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #146739 from chvp/bump-pywlroots•••pywlroots: 0.14.9 -> 0.14.11	Kira Bruneau	2021-11-20	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	pywlroots: 0.14.9 -> 0.14.11	Charlotte Van Petegem	2021-11-20	1	-2/+2
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #146741 from trofi/fix-afterstep-for-binutils-2.36•••afterstep: fix build on upcoming binutils-2.36	Anderson Torres	2021-11-20	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	afterstep: fix build on upcoming binutils-2.36•••Without the change build fails on binutils-2.36 as: ar clq libAfterBase.a ashash.o ... ar: libdeps specified more than once	Sergei Trofimovich	2021-11-20	1	-0/+8
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #139763 from onny/foo2zjs•••foo2zjs: add hbpl1 printers support	7c6f434c	2021-11-20	3	-1/+4785
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	foo2zjs: add hbpl1 printers support	Jonas Heinrich	2021-11-20	3	-1/+4785
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #146474 from trofi/update-nmon•••nmon: 16m -> 16n	Bobby Rong	2021-11-20	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nmon: 16m -> 16n	Sergei Trofimovich	2021-11-18	1	-2/+2
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #123680 from Synthetica9/test-vscodium-wayland	Patrick Hilhorst	2021-11-20	5	-72/+112
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nixosTests.vscodium: add comments	Patrick Hilhorst	2021-11-20	1	-1/+6
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test-driver.py: directly import pathlib.Path	Patrick Hilhorst	2021-11-20	1	-32/+32
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nixosTests.vscodium: wait for different text	Patrick Hilhorst	2021-11-19	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nixosTests.vscodium: rename machines	Patrick Hilhorst	2021-11-19	1	-3/+6
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test-driver.py: always export single machine as 'machine'	Patrick Hilhorst	2021-11-19	2	-1/+7
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test-driver.py: fix weird non-pythonism	Patrick Hilhorst	2021-11-19	1	-3/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nixos/tests/vscodium{,-wayland}: merge tests	Patrick Hilhorst	2021-11-19	3	-91/+51
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nixos/tests/vscodium-wayland: init	Patrick Hilhorst	2021-11-19	2	-0/+68
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #146664 from smancill/ZHF-masscan•••masscan: fix build on darwin	Domen Kožar	2021-11-20	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	masscan: fix build on darwin	Sebastián Mancilla	2021-11-19	1	-0/+5
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #146735 from r-burns/ndk-bundle•••ndk-bundle: fix build	Domen Kožar	2021-11-20	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ndk-bundle: fix build•••Since b79483d2b72c8e349a8fa8a6e67e8061d82d6027, the various architectures of the prebuilt libraries cause errors, so we need to tell patchelf to ignore missing deps.	Ryan Burns	2021-11-19	1	-0/+1
\| \| \|_\|_\|_\|_\|/ / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #146720 from marsam/fix-grpc-aarch64•••grpc: fix build on aarch64	Mario Rodas	2021-11-20	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \