github-actions[bot]
f2eada4ab8
Merge master into staging-next
2021-07-18 06:01:33 +00:00
Ben Siraphob
ff4f2b6b85
Merge pull request #130438 from primeos/ungoogled-chromium
...
ungoogled-chromium: 91.0.4472.114 -> 91.0.4472.164
2021-07-18 11:58:13 +07:00
Ben Siraphob
64cdc97f4d
Merge pull request #130502 from SuperSandro2000/fix-collection29
...
Fix collection29
2021-07-18 11:44:38 +07:00
Babbaj
aabf5dd5f7
looking-glass-client: B3 -> B4
2021-07-17 23:22:17 -04:00
Ben Siraphob
d352d407ee
Merge pull request #130469 from Stunkymonkey/inherit-version2
...
various: cleanup of "inherit version;"
2021-07-18 10:16:05 +07:00
Ben Siraphob
00cfd7ecd6
Merge pull request #130378 from Atemu/update/linux_lqx
...
linux_lqx: 5.12.14 -> 5.12.17
2021-07-18 09:54:28 +07:00
Bernardo Meurer
290aeb344f
buildLinux: pass buildPackages to linuxManualConfig
...
We should be using the _same_ buildPackages when we generate the
configuration (which happens in buildLinux) as when we actually build
the kernel (which happens in linuxManualConfig).
This change enforces that when we callPackage `manual-config.nix` we
pass on whatever `buildPackages` that `buildLinux` itself was called
with.
2021-07-17 18:57:35 -07:00
github-actions[bot]
382fdc7ad3
Merge master into staging-next
2021-07-18 00:01:24 +00:00
Sandro Jäckel
fa949bad45
zsh-autoenv: add unstable to version
2021-07-18 01:12:35 +02:00
Sandro
688b4cb03e
Merge pull request #129697 from piegamesde/node2nixfix
2021-07-18 00:54:24 +02:00
Sandro
24debc24c6
Merge pull request #130194 from Stunkymonkey/fdr-phases
...
fdr: deprecate phases
2021-07-18 00:41:56 +02:00
Sandro
6d5a8a4acd
Merge pull request #130432 from fabaff/bump-pyvicare
2021-07-18 00:40:37 +02:00
Sandro
5378442edd
Merge pull request #130488 from Stunkymonkey/zsh-command-time-phases
...
zsh-command-time: deprecate phases
2021-07-18 00:40:09 +02:00
Sandro
6555da04a7
Merge pull request #130491 from Stunkymonkey/skk-dicts-phases
...
skk-dicts: deprecate phases
2021-07-18 00:39:30 +02:00
Sandro
3ef2003b63
Merge pull request #128889 from nitsky/mold
2021-07-18 00:38:56 +02:00
Sandro
b4176ae90a
Merge pull request #130472 from Stunkymonkey/inherit-version3
...
various: cleanup of "inherit version;"
2021-07-18 00:38:39 +02:00
Sandro
dd35f1750c
Merge pull request #130157 from kvtb/patch-10
...
pkgsi686Linux.llvmPackages_12.compiler-rt: fix build
2021-07-18 00:31:28 +02:00
Sandro
53217ccbae
Merge pull request #130504 from Stunkymonkey/inherit-version4
...
treewide: remove meta.version
2021-07-18 00:28:32 +02:00
Martin Weinelt
d9a3a54b73
Merge pull request #129980 from mweinelt/nixos/kea
2021-07-18 00:26:35 +02:00
Sandro
dbcb11bbe1
Merge pull request #130453 from risicle/ris-exiv2-darwin-libiconv
...
exiv2: fix for darwin
2021-07-18 00:25:03 +02:00
Sandro
3411632976
Merge pull request #130496 from SuperSandro2000/sshuttle
...
sshuttle: format, cleanup, remove extra test dependencies
2021-07-18 00:23:12 +02:00
Aleksandr Petrosyan
ab65de76bf
yandex-disk: 0.1.5.1039 -> 0.1.6.1074 ( #130450 )
2021-07-18 00:22:34 +02:00
Sandro
7f3e172401
Merge pull request #130487 from Stunkymonkey/antigen-phases
...
antigen: deprecate phases
2021-07-18 00:21:00 +02:00
Sandro
c64bc214ef
mold: mark broken on aarch64
2021-07-18 00:19:30 +02:00
Felix Buehler
87316d778b
various: cleanup of "inherit version;"
2021-07-18 00:19:24 +02:00
Sandro
a314be4b4d
Merge pull request #130439 from LeSuisse/ant-CVE-2021-36373-CVE-2021-36374
2021-07-18 00:15:04 +02:00
Sandro
24f72b6152
python3Packages.editables: cleanup ( #130476 )
2021-07-18 00:14:33 +02:00
Sandro Jäckel
0117861a83
apulse: switch to pname + version
2021-07-18 00:11:26 +02:00
Sandro Jäckel
0742070794
nanopb/test-message-with-{annotations,options}: fix typo
2021-07-18 00:11:26 +02:00
Sandro Jäckel
efd793b484
vdr.plugins: switch to pname + version, format
2021-07-18 00:11:25 +02:00
Sandro Jäckel
91e4af79d0
thinking-rock: switch to pname + version
2021-07-18 00:11:25 +02:00
Felix Buehler
82cb33a0ae
treewide: remove meta.version
2021-07-18 00:07:38 +02:00
Sandro
b59c06dc92
Merge pull request #130494 from Stunkymonkey/mnist-phases
...
mnist: deprecate phases
2021-07-17 23:14:59 +02:00
Sandro
18d5273815
Merge pull request #130490 from onsails/vim-plugins
2021-07-17 23:13:41 +02:00
Robert Hensing
66c6ec450f
Merge pull request #130492 from roberth/revert-130196-partially
...
Partially revert "various: cleanup of 'inherit version;'"
2021-07-17 23:09:59 +02:00
Yannick Markus
da37c8ebca
wofi-emoji: init at unstable-2021-05-24 ( #130260 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-17 23:07:28 +02:00
Sandro
5a39521aff
Merge pull request #130211 from lourkeur/chia
...
chia: 1.2.1 -> 1.2.2
2021-07-17 23:05:00 +02:00
Sandro Jäckel
0e4f71d8a8
sshuttle: format, cleanup, remove extra test dependencies
2021-07-17 23:03:01 +02:00
Robert Scott
ee252b7812
Merge pull request #129435 from r-ryantm/auto-update/fend
...
fend: 0.1.17 -> 0.1.20
2021-07-17 21:49:39 +01:00
Sandro
28425b4e36
Merge pull request #130484 from SuperSandro2000/mdcat
...
mdcat: fix wezterm detection through TERM
2021-07-17 22:47:29 +02:00
Sandro
3be51a3f6f
Merge pull request #130458 from ninjin/julia-bin_162
2021-07-17 22:45:39 +02:00
Felix Buehler
d9d7d1565e
mnist: deprecate phases
2021-07-17 22:45:19 +02:00
Sandro
986276e7e9
Merge pull request #130480 from Mindavi/libgxps/cross
2021-07-17 22:44:16 +02:00
Sandro
ab2a403877
Merge pull request #130481 from Stunkymonkey/clooj-phases
...
clooj: deprecate phases
2021-07-17 22:43:59 +02:00
Felix Buehler
e023025ee0
various: cleanup of "inherit version;"
2021-07-17 22:39:35 +02:00
Robert Hensing
0e5cfdb8c5
Partially revert "various: cleanup of 'inherit version;'"
...
I forgot to unresolve a conversation, causing the PR to be merged
prematurely by someone else.
This partially reverts commit 1e9baed56b
.
2021-07-17 22:39:28 +02:00
Sandro
1131b5a0e7
Merge pull request #130478 from Stunkymonkey/runningx-phases
...
runningx: deprecate phases
2021-07-17 22:39:23 +02:00
Sandro
abeb1d383a
Merge pull request #130483 from alexeyre/update-scli
...
scli: 0.6.3 -> 0.6.4
2021-07-17 22:38:42 +02:00
Sandro
99c472a5bc
Merge pull request #130485 from Stunkymonkey/facedetect-phases
2021-07-17 22:38:27 +02:00
Sandro
a32c81a3d8
Merge pull request #130486 from Stunkymonkey/lvmsync-phases
2021-07-17 22:38:13 +02:00