Commit Graph

17540 Commits

Author SHA1 Message Date
R. Ryantm
5df2206a4d sof-firmware: 1.9.3 -> 2.0 2021-12-26 15:07:19 +00:00
github-actions[bot]
7096340b0c
Merge master into staging-next 2021-12-26 12:01:14 +00:00
Bobby Rong
f5dd11f444
Merge pull request #150357 from r-ryantm/auto-update/acpid
acpid: 2.0.32 -> 2.0.33
2021-12-26 19:31:20 +08:00
Bobby Rong
75f0630226
Merge pull request #152144 from r-ryantm/auto-update/libtraceevent
libtraceevent: 1.4.0 -> 1.5.0
2021-12-26 18:59:38 +08:00
github-actions[bot]
cacc9073e1
Merge master into staging-next 2021-12-26 06:01:16 +00:00
zowoq
c9044f1de1 libbpf: fix passthru.tests
b5158636c8
2021-12-26 11:37:58 +10:00
github-actions[bot]
10263fd59e
Merge master into staging-next 2021-12-26 00:01:55 +00:00
Sergei Trofimovich
d32fcc684c multipath-tools: pull upstream fix for -fno-cmmon toolchains
Without the change build on clang-12 (and upstream gcc-10+) fails as:

    $ nix build -L --impure --expr 'with import ./. {}; multipath-tools.override { stdenv = clang12Stdenv; }'
    ...
    multipath-tools> ld: callout.o:libmultipath/./structs.h:109:
      multiple definition of `___error1___'; devmapper.o:structs.h:109: first defined here
2021-12-25 22:38:47 +00:00
Dmitry Kalinkin
2ddda43924
Merge branch 'staging' into staging-next
Conflicts:
	pkgs/os-specific/linux/kernel/common-config.nix
2021-12-25 17:16:26 -05:00
R. Ryantm
d68b53ee95 libtraceevent: 1.4.0 -> 1.5.0 2021-12-25 21:47:41 +00:00
Maciej Krüger
a83390d767
Merge pull request #152122 from fortuneteller2k/fix-xanmod 2021-12-25 22:45:10 +01:00
fortuneteller2k
de06c5e8e8 linux_xanmod: remove duplicate android kernel options
and enable WINESYNC in kernel config
2021-12-26 04:58:32 +08:00
Vladimír Čunát
671a70d31b
Merge #150514: libbpf: 0.6.0 -> 0.6.1 2021-12-25 19:17:42 +01:00
Jörg Thalheim
276bd41027
Merge pull request #151733 from Mic92/zen
linux_zen: 5.15.8-zen1 -> 5.15.11-zen1
2021-12-25 17:49:18 +00:00
Vladimír Čunát
dfc501756b
Merge #148396: staging-next iteration 2021-12-03 2021-12-25 18:03:46 +01:00
Felix Bühler
a112ff84eb
Merge pull request #149678 from Stunkymonkey/treewide-pname-version-4
treewide: use pname&version instead of name
2021-12-25 13:56:08 +01:00
Profpatsch
eef4a51941 skawarePackages: Winter 2021-2022 release
I bumped all versions of all packages that we packaged so far (I
hope). We might want to build an update script at some point, there is
a lot of potential for copy & paste errors in these updates.

Laurent’s notes below:

  Hello,

  New versions of all the skarnet.org packages are available.

  The changes are, for the most part, minimal: essentially, the new
versions fix a bug in the build system that made cross-building under
slashpackage more difficult than intended. Very few people should
have been impacted by this bug.
  Some packages had a few more bugfixes; and some packages have
additional functionality. No major update; no compatibility break.

  The new versions are the following:

skalibs-2.11.1.0 (minor)
nsss-0.2.0.1 (release)
utmps-0.1.1.0 (minor)
execline-2.8.2.0 (minor)
s6-2.11.0.1 (release)
s6-rc-0.5.3.0 (minor)
s6-portable-utils-2.2.3.4 (release)
s6-linux-utils-2.5.1.7 (release)
s6-linux-init-1.0.7.0 (minor)
s6-dns-2.3.5.3 (release)
s6-networking-2.5.1.0 (minor)
mdevd-0.1.5.1 (release)
bcnm-0.0.1.5 (release)
dnsfunnel-0.0.1.3 (release)
smtpd-starttls-proxy-0.0.1.1 (release)

  Dependencies have all been updated to the latest versions. They are not
strict: libraries and binaries may build with older releases of their
dependencies, although this is not guaranteed.

  You do not need to recompile your s6-rc service databases. To make use
of the new s6-linux-init functionality, however, you will have to
recreate your run-image.
  You do not need to restart your supervision tree, unless you're
deleting
your old s6 binaries.

  Details of minor package changes follow.

* skalibs-2.11.1.0
   ----------------

  - New function: opendir_at()

* utmps-0.1.1.0
   ------------

  - New binary: utmps-write, a generic utmp client that can write
user-crafted records to the utmp and/or wtmp databases.

* execline-2.8.2.0
   ----------------

  - New -s option to the case binary, enabling fnmatch() (shell)
expression matching instead of regular expression matching.

* s6-rc-0.5.3.0
   -------------

  - Bundle contents are now read in a "contents.d/" subdirectory, one
file per content, instead of one per line in a "contents" file. In
the same way, service dependencies are now read in a "dependencies.d/"
subdirectory, one file per dependency. Old "contents" and "dependencies"
files are still supported, but deprecated. This change allows better
integration of s6-rc service definitions with package managers.

* s6-linux-init-1.0.7.0
   ---------------------

  - New -S option to s6-linux-init-maker, forcing a sync on halt even
in a container.

* s6-networking-2.5.1.0
   ---------------------

  - SNI wildcarding is implemented, as well as a workaround for a
bearssl bug causing errors on certificate signatures in certain cases.

  Enjoy,
  Bug-reports welcome.
  And happy holidays to you all!

--
  Laurent
2021-12-25 13:03:14 +01:00
github-actions[bot]
15494ec8f1
Merge master into staging-next 2021-12-25 12:01:18 +00:00
Maximilian Bosch
c26675459f
Merge pull request #151645 from r-ryantm/auto-update/alsa-utils
alsa-utils: 1.2.5.1 -> 1.2.6
2021-12-25 12:13:53 +01:00
Maximilian Bosch
d471a92e8d
Merge pull request #151792 from TredwellGit/linux
Kernels 2021-12-22
2021-12-25 11:06:07 +01:00
github-actions[bot]
f04946ad25
Merge master into staging-next 2021-12-24 18:01:11 +00:00
Felix Buehler
b5e0221e44 treewide: use pname&version instead of name 2021-12-24 15:51:27 +01:00
Felix Bühler
e5a24a242d
Merge pull request #152001 from Stunkymonkey/seturgent-refactor
seturgent: unstable-2012-08-17 -> 1.5
2021-12-24 14:33:13 +01:00
markuskowa
ec9e6999fe
Merge pull request #151763 from r-ryantm/auto-update/sysvinit
sysvinit: 3.00 -> 3.01
2021-12-24 13:20:09 +01:00
github-actions[bot]
f5da7cc8e1
Merge master into staging-next 2021-12-24 12:01:23 +00:00
markuskowa
e1210debcd
Merge pull request #151982 from NickCao/rdma-core
rdma-core: fix cross compilation, set strictDeps
2021-12-24 12:57:11 +01:00
Felix Buehler
81affdbe10 seturgent: unstable-2012-08-17 -> 1.5 2021-12-24 12:45:56 +01:00
Bobby Rong
761b57221e
Merge pull request #151895 from r-ryantm/auto-update/powercap
powercap: 0.4.0 -> 0.5.0
2021-12-24 18:51:20 +08:00
Nick Cao
3d06d15559
rdma-core: fix cross compilation, set strictDeps 2021-12-24 15:56:30 +08:00
Bobby Rong
88df114fa8
Merge pull request #151975 from NickCao/radeontop
radeontop: fix cross compilation
2021-12-24 15:40:54 +08:00
Nick Cao
ac0f955c76
radeontop: fix cross compilation 2021-12-24 15:07:29 +08:00
Bobby Rong
e6c459f526
acpid: drop unneeded substituteInPlace 2021-12-24 15:07:14 +08:00
github-actions[bot]
4a543cc4d3
Merge master into staging-next 2021-12-24 06:01:16 +00:00
7c6f434c
85ef7b31fb
Merge pull request #151910 from lovesegfault/acpi-call-fix-flags
linuxPackages.acpi_call: use kernel makeFlags
2021-12-24 03:49:27 +00:00
github-actions[bot]
b7f2d2da61
Merge master into staging-next 2021-12-24 00:01:44 +00:00
Linus Heckemann
e998439b18
Merge pull request #151140 from lheckemann/fsl_uapi
linux: enable FSL_MC_UAPI_SUPPORT
2021-12-24 00:33:46 +01:00
Dmitry Kalinkin
1a9297102c
Merge branch 'master' into staging-next 2021-12-23 16:58:33 -05:00
Bernardo Meurer
0aec77573b
linux_xanmod: 5.15.7 -> 5.15.11 2021-12-23 17:44:59 -03:00
Bernardo Meurer
55a3df2847
linuxPackages.acpi_call: use kernel makeFlags
This allows the module to build for clang-built kernels
2021-12-23 17:37:50 -03:00
Jonathan Ringer
182e07f0d9
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/libraries/webkitgtk/default.nix
	pkgs/development/python-modules/pylast/default.nix
	pkgs/development/python-modules/pymavlink/default.nix
2021-12-23 10:16:42 -08:00
R. Ryantm
cbdfd71c84 powercap: 0.4.0 -> 0.5.0 2021-12-23 16:19:07 +00:00
TredwellGit
387250dce5 linux_latest-libre: 18484 -> 18517 2021-12-22 17:18:23 +00:00
TredwellGit
0cb00d51f7 linux-rt_5_10: 5.10.83-rt58 -> 5.10.87-rt59 2021-12-22 17:18:04 +00:00
TredwellGit
fbd944d91d linux: 5.4.167 -> 5.4.168 2021-12-22 17:09:52 +00:00
TredwellGit
fa7b495239 linux: 5.15.10 -> 5.15.11 2021-12-22 17:09:45 +00:00
TredwellGit
9b43bf552f linux: 5.10.87 -> 5.10.88 2021-12-22 17:09:37 +00:00
TredwellGit
2ccbef604f linux: 4.9.293 -> 4.9.294 2021-12-22 17:09:31 +00:00
TredwellGit
11486e8377 linux: 4.4.295 -> 4.4.296 2021-12-22 17:09:20 +00:00
TredwellGit
545cffb0b5 linux: 4.19.221 -> 4.19.222 2021-12-22 17:09:14 +00:00
TredwellGit
b375970256 linux: 4.14.258 -> 4.14.259 2021-12-22 17:09:08 +00:00
R. Ryantm
4293769d8e sysvinit: 3.00 -> 3.01 2021-12-22 14:21:29 +00:00
Jörg Thalheim
c5e9cacf97 linux_zen: 5.15.8-zen1 -> 5.15.11-zen1 2021-12-22 11:41:10 +01:00
github-actions[bot]
39d035c4cf
Merge master into staging-next 2021-12-22 00:01:35 +00:00
R. Ryantm
33aab6d425 alsa-plugins: 1.2.5 -> 1.2.6 2021-12-21 23:25:30 +00:00
R. Ryantm
75da7f9f53 alsa-utils: 1.2.5.1 -> 1.2.6 2021-12-21 22:01:02 +00:00
Renaud
864de8cb03
powerstat: 0.02.25 -> 0.02.27
(#151442)
2021-12-21 22:53:22 +01:00
Renaud
3fb18b1a73
power-calibrate: 0.01.29 -> 0.01.34
(#151440)
2021-12-21 22:52:44 +01:00
Allen Short
9e47e60971 amdgpu-pro: 17.40 -> 21.30 2021-12-21 11:17:34 -04:00
github-actions[bot]
0757d9c156
Merge master into staging-next 2021-12-21 12:01:23 +00:00
7c6f434c
8572c5f792
Merge pull request #151545 from Stunkymonkey/forktty-refactor
forktty: refactor
2021-12-21 11:43:03 +00:00
Felix Buehler
ec0126de09 forktty: refactor 2021-12-21 12:12:33 +01:00
Felix Buehler
bfd87658ef conspy: refactor 2021-12-21 12:10:50 +01:00
Dmitry Kalinkin
ac40a963c9
Merge branch 'master' into staging-next
Conflicts:
	pkgs/applications/editors/vim/common.nix
	pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
	pkgs/development/python-modules/pymavlink/default.nix
2021-12-20 12:09:28 -05:00
Renaud
7dcb25726b
health-check: 0.03.05 -> 0.03.10
Upstream has moved
(#151325)
2021-12-20 16:04:53 +01:00
Renaud
e6a705413d
forkstat: 0.02.16 -> 0.02.17
Upstream has moved
(#151318)
2021-12-20 16:04:22 +01:00
Renaud
0f2042888d
eventstat: 0.04.12 -> 0.04.13
Upstream has moved to Github
(#151245)
2021-12-20 16:03:45 +01:00
Nick Hu
e0e8ca98c7
asus-ec-sensors: init at 2021-12-16 (#150989) 2021-12-20 10:48:08 +00:00
Nick Hu
c9a191dd6b
liquidtux: init at 2021-12-16 (#150997) 2021-12-20 10:47:44 +00:00
Renaud
7b9ed73e82
smemstat: 0.02.10 -> 0.02.11
Upstream has moved
(#151330)
2021-12-20 09:31:43 +01:00
Sandro
69a2c62cf7
Merge pull request #151168 from SuperSandro2000/phreedom 2021-12-19 23:58:24 +01:00
Dmitry Kalinkin
984f2b02ca
Merge pull request #149530 from alyssais/util-linux-static
[staging-next] Revert "util-linux: fix static build"
2021-12-19 12:26:26 -05:00
Michael Weiss
76f52dd9e3
Merge pull request #142138 from primeos/fscrypt
fscrypt-experimental: 0.3.0 -> 0.3.1
2021-12-19 14:50:28 +01:00
github-actions[bot]
a254c225b6
Merge staging-next into staging 2021-12-19 12:01:52 +00:00
github-actions[bot]
df27583677
Merge master into staging-next 2021-12-19 12:01:19 +00:00
Sandro Jäckel
cbfc50722f
maintainers: drop phreedom 2021-12-19 07:30:50 +01:00
Renaud
99d859d4b5
cpustat: 0.02.09 -> 0.02.17
Upstream has moved to Github
2021-12-18 23:40:53 +01:00
Dmitry Kalinkin
0cf94e8de4
Merge branch 'staging-next' into staging 2021-12-18 10:19:31 -05:00
Dmitry Kalinkin
da8f155b2a
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/sphinxext-opengraph/default.nix
2021-12-18 10:18:14 -05:00
Maximilian Bosch
fc3bf75327
Merge pull request #150726 from TredwellGit/linux
Kernels 2021-12-17
2021-12-18 16:11:19 +01:00
Bobby Rong
9fc0f12bee
Merge pull request #150638 from polykernel/greetd-0.8.0-update
greetd: 0.7.0 -> 0.8.0
2021-12-18 21:09:57 +08:00
github-actions[bot]
8d45187fd8
Merge staging-next into staging 2021-12-18 06:01:57 +00:00
github-actions[bot]
c690fb1ecd
Merge master into staging-next 2021-12-18 06:01:22 +00:00
Timothy DeHerrera
b690244c7e
Merge pull request #150978 from LibreCybernetics/nvidia-updates
nVidia Updates
2021-12-17 17:50:35 -07:00
TredwellGit
8d4c056723 linux/hardened/patches/5.4: 5.4.164-hardened1 -> 5.4.167-hardened1 2021-12-17 23:09:47 +00:00
TredwellGit
f51d19746a linux/hardened/patches/5.15: 5.15.7-hardened1 -> 5.15.10-hardened1 2021-12-17 23:09:39 +00:00
TredwellGit
a900de3567 linux/hardened/patches/5.10: 5.10.84-hardened1 -> 5.10.87-hardened1 2021-12-17 23:09:32 +00:00
TredwellGit
8e317ff982 linux/hardened/patches/4.19: 4.19.220-hardened1 -> 4.19.221-hardened1 2021-12-17 23:09:25 +00:00
TredwellGit
d9fdc409d1 linux/hardened/patches/4.14: 4.14.257-hardened1 -> 4.14.258-hardened1 2021-12-17 23:09:18 +00:00
TredwellGit
a1470e23da linux: 5.4.164 -> 5.4.167 2021-12-17 23:08:29 +00:00
TredwellGit
8955b58c5e linux: 5.15.7 -> 5.15.10 2021-12-17 23:08:22 +00:00
TredwellGit
72b54385a5 linux: 5.10.84 -> 5.10.87 2021-12-17 23:08:15 +00:00
TredwellGit
837103a484 linux: 4.9.292 -> 4.9.293 2021-12-17 23:08:08 +00:00
TredwellGit
2deb4377d5 linux: 4.4.294 -> 4.4.295 2021-12-17 23:08:02 +00:00
TredwellGit
9eacb2bb44 linux: 4.19.220 -> 4.19.221 2021-12-17 23:07:56 +00:00
TredwellGit
860b4c92b8 linux: 4.14.257 -> 4.14.258 2021-12-17 23:07:50 +00:00
Linus Heckemann
588db2a720 linux: enable FSL_MC_UAPI_SUPPORT 2021-12-18 00:05:49 +01:00
TredwellGit
f1edf331df firmwareLinuxNonfree: 20211027 -> 20211216 2021-12-17 23:00:21 +00:00
github-actions[bot]
3fa6ddfa60
Merge staging-next into staging 2021-12-17 18:01:42 +00:00
github-actions[bot]
0a43f16292
Merge master into staging-next 2021-12-17 18:01:03 +00:00
Jörg Thalheim
f9a555b9fb
Merge pull request #150996 from Mic92/sysdig
sysdig: 0.27.1 -> 0.28.0
2021-12-17 12:39:02 +00:00
Franz Pletz
318c9f8860
Merge pull request #150923 from amarshall/zfs-2.1.2
zfs: 2.1.1 → 2.1.2
2021-12-17 13:23:14 +01:00
github-actions[bot]
a6adcc1edf
Merge staging-next into staging 2021-12-17 12:02:12 +00:00
github-actions[bot]
001096a857
Merge master into staging-next 2021-12-17 12:01:31 +00:00
Bobby Rong
b4693d8dae
Merge pull request #149948 from veehaitch/sgx-sdk-2.15.1
sgx-sdk, sgx-psw: 2.14 -> 2.15.1
2021-12-17 15:53:06 +08:00
Alyssa Ross
e07182012b
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/pint/default.nix
2021-12-17 05:50:06 +00:00
github-actions[bot]
7d786912ce
Merge master into staging-next 2021-12-17 00:01:56 +00:00
Maximilian Bosch
fb0091f094
Merge pull request #150975 from NixOS/revert-150065-workaround-issue-144811
Revert "nixos-rebuild: switch to tmpDir during rebuilds"
2021-12-16 23:15:04 +01:00
Dmitry Kalinkin
889227a048
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/pdftotext/default.nix
2021-12-16 16:55:25 -05:00
Jörg Thalheim
9235ba7132
Update pkgs/os-specific/linux/sysdig/default.nix 2021-12-16 19:29:45 +00:00
Jörg Thalheim
0c302891d0 sysdig: 0.27.1 -> 0.28.0 2021-12-16 18:52:09 +01:00
Thiago Kenji Okada
e6ca3fc976 Revert "nixos-rebuild: switch to tmpDir during rebuilds"
This seems to break
`boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages`
causing it to use `linuxPackages`.
2021-12-16 14:47:07 -03:00
Jörg Thalheim
257c321cb2
Merge pull request #150958 from Mic92/zen
linux_zen: 5.15.6-zen2 -> 5.15.8-zen1
2021-12-16 17:27:22 +00:00
Fabián Heredia Montiel
ebd4f40393 nvidia_x11: 470.86 → 470.94 2021-12-16 09:51:06 -06:00
Fabián Heredia Montiel
ebdf40eb18 nvidia_x11: 495.44 → 495.46 2021-12-16 09:23:07 -06:00
Bobby Rong
79a85e0c64
Merge pull request #150512 from hmenke/sof
sof-firmware: 1.9.2 -> 1.9.3
2021-12-16 20:50:55 +08:00
Jörg Thalheim
6942ed7b84 linux_zen: 5.15.6-zen2 -> 5.15.8-zen1 2021-12-16 12:52:56 +01:00
Andrew Marshall
04ae83ae6b zfs: 2.1.1 -> 2.1.2 2021-12-15 22:03:17 -05:00
Andrew Marshall
9339e8e093 zfs: Update repository
zfsonlinux/zfs redirects to openzfs/zfs.
2021-12-15 21:35:35 -05:00
github-actions[bot]
3e2d1c1e65
Merge staging-next into staging 2021-12-15 18:01:52 +00:00
github-actions[bot]
1e85228aa6
Merge master into staging-next 2021-12-15 18:01:15 +00:00
Thiago Kenji Okada
d95c81133f
Merge pull request #150065 from thiagokokada/workaround-issue-144811
nixos-rebuild: switch to tmpDir during rebuilds
2021-12-15 12:01:31 -03:00
Vincent Haupert
4f7f8d0b2d sgx-sdk, sgx-psw: 2.14 -> 2.15.1
Also add some of the new samples as tests. Disable parallel builds for
the samples as they don't seem to support it (fail randomly).
2021-12-15 13:09:18 +01:00
github-actions[bot]
83750a4f3d
Merge staging-next into staging 2021-12-14 18:01:49 +00:00
github-actions[bot]
dfda17d6ba
Merge master into staging-next 2021-12-14 18:01:09 +00:00
Dmitry Kalinkin
33967b375a
Merge pull request #150508 from illustris/sssd
sssd: 2.6.0 -> 2.6.1, fix broken build
2021-12-14 10:31:21 -05:00
illustris
434985c90b sssd: link NixOS module tests 2021-12-14 19:46:21 +05:30
illustris
580952d787 sssd: 2.6.0 -> 2.6.1, fix broken build
python2Packages.ldap fails to build since https://github.com/NixOS/nixpkgs/pull/149010
This PR drops python2 bindings for sssd.
2021-12-14 19:46:12 +05:30
polykernel
dcd2dc8327 greetd: 0.7.0 -> 0.8.0 2021-12-13 23:31:30 -05:00
github-actions[bot]
75e029e297
Merge staging-next into staging 2021-12-14 00:02:27 +00:00
github-actions[bot]
420df1e082
Merge master into staging-next 2021-12-14 00:01:45 +00:00
sternenseemann
1d0f825944 solo5: 0.6.8 -> 0.6.9
https://github.com/Solo5/solo5/releases/tag/v0.6.9
2021-12-13 22:00:02 +00:00
Bernardo Meurer
f40283cf62
Merge pull request #149837 from helsinki-systems/feat/redo-activation-script-restarting
nixos/switch-to-configuration: Add a massive test and do a slight refactor
2021-12-13 11:37:20 -08:00
github-actions[bot]
1a2b61419f
Merge staging-next into staging 2021-12-13 18:01:54 +00:00
github-actions[bot]
784572e7cf
Merge master into staging-next 2021-12-13 18:01:18 +00:00
Jörg Thalheim
afa3c99cd5
Merge pull request #148593 from veehaitch/sgx-psw
sgx-psw: init package and module
2021-12-13 14:16:26 +00:00
github-actions[bot]
60c2e603bb
Merge staging-next into staging 2021-12-13 12:02:07 +00:00
Martin Weinelt
423119b70b
Merge branch 'master' into staging-next 2021-12-13 12:20:07 +01:00
Janne Heß
271a0da71b
Merge pull request #150300 from r-ryantm/auto-update/cifs-utils 2021-12-13 12:07:13 +01:00
Sascha Grunert
b5158636c8
libbpf: 0.6.0 -> 0.6.1
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
2021-12-13 10:28:42 +01:00
Henri Menke
c802431094
sof-firmware: 1.9.2 -> 1.9.3 2021-12-13 09:55:40 +01:00
Fabian Affolter
ee16149972 cpuid: 20211129 -> 20211210 2021-12-12 23:33:47 +01:00
Janne Heß
150ef522a0
Merge pull request #150207 from r-ryantm/auto-update/cryptsetup 2021-12-12 20:13:00 +01:00
R. Ryantm
6c489f09f9 acpid: 2.0.32 -> 2.0.33 2021-12-12 01:50:00 +00:00
R. Ryantm
8af5d6c825 cifs-utils: 6.13 -> 6.14 2021-12-11 20:35:11 +00:00
Dmitry Kalinkin
07a8ae0c5a
Merge branch 'staging-next' into staging
Conflicts:
	pkgs/development/libraries/log4cplus/default.nix
2021-12-11 14:01:19 -05:00
Dmitry Kalinkin
b6b59334bb
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/celery/default.nix
	pkgs/development/python-modules/kombu/default.nix
2021-12-11 13:15:49 -05:00
Jörg Thalheim
444503997b
Merge pull request #150256 from r-ryantm/auto-update/brillo
brillo: 1.4.9 -> 1.4.10
2021-12-11 15:13:40 +00:00
R. Ryantm
6ac74b47e2 brillo: 1.4.9 -> 1.4.10 2021-12-11 14:35:26 +00:00
Jörg Thalheim
f6f27d2990
Merge pull request #150174 from r-burns/mandoc
os-specific/netbsd: fix mandoc splicing
2021-12-11 13:24:19 +00:00
github-actions[bot]
a875f4053e
Merge master into staging-next 2021-12-11 12:01:07 +00:00