nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 19:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
227,680 Commits 196 Branches 125 Tags 5.9 GiB
99d2567515
Commit Graph

12342 Commits

Author SHA1 Message Date
Tim Steinbach
2f10053834
linux: 5.4.34 -> 5.4.35 2020-04-23 08:17:06 -04:00
Tim Steinbach
62a608fd63
linux: 4.19.117 -> 4.19.118 2020-04-23 08:16:58 -04:00
Frederik Rietdijk
cff0669a48 Merge master into staging-next 2020-04-23 08:11:16 +02:00
Tim Steinbach
629068fe5b
linux_latest-libre: 17402 -> 17445 2020-04-22 19:40:01 -04:00
kraem
fca903c7dd
linux/hardened-patches/4.19.117: init at 4.19.117.a 2020-04-22 02:12:28 +02:00
kraem
99f30a5635
linux/hardened-patches/5.4.34: init at 5.4.34.a 2020-04-22 02:12:25 +02:00
kraem
3c81b3df4e
linux/hardened-patches/5.5.19: init at 5.5.19.a 2020-04-22 02:12:21 +02:00
kraem
c8b5e37764
linux/hardened-patches/5.6.6: init at 5.6.6.a 2020-04-22 02:12:17 +02:00
kraem
efafc50f5c
linux/hardened-patches/4.19.116: remove 2020-04-21 22:18:03 +02:00
kraem
8f2e9fcadd
linux/hardened-patches/5.5.18: remove 2020-04-21 22:18:03 +02:00
kraem
9ed70f4e46
linux/hardened-patches/5.6.5: remove 2020-04-21 22:18:03 +02:00
kraem
15807c58ad
linux/hardened-patches/5.4.33: remove 2020-04-21 22:18:02 +02:00
kraem
c9cf25bc61
linux: 5.6.5 -> 5.6.6 2020-04-21 21:59:59 +02:00
kraem
1e23dcbf22
linux: 5.5.18 -> 5.5.19 2020-04-21 21:59:22 +02:00
kraem
18c2b5a9aa
linux: 5.4.33 -> 5.4.34 2020-04-21 21:58:45 +02:00
kraem
e074301be8
linux: 4.19.116 -> 4.19.117 2020-04-21 21:58:03 +02:00
Linus Heckemann
6673a4988e
gnupg: use libusb1 (#85374) 
* gnupg: use libusb1

This fixes scdaemon's direct ccid support.

* systemd: fix gnupg-minimal
 2020-04-21 08:35:40 +02:00
Frederik Rietdijk
803b3d296c Merge staging-next into staging 2020-04-21 08:29:51 +02:00
oxalica
7760cff5d7 util-linux: 2.33.2 -> 2.35.1 2020-04-21 08:12:29 +02:00
Dmitry Kalinkin
c00ad799a0
darwin.cctools: install ar man pages 
In the distribution they are located in a separate directory from the
others and the standard installation doesn't process them.
 2020-04-20 23:56:51 -04:00
Dmitry Kalinkin
125c469d3e
darwin.binutils.bintools: propagate man pages from cctools 2020-04-20 23:49:02 -04:00
Dmitry Kalinkin
3e880bad79
darwin.cctools: split man output 2020-04-20 19:51:49 -04:00
kraem
523fe98821 linux/hardened-patches/4.19.116: 4.19.116.NixOS-a -> 4.19.116.a 2020-04-20 10:05:36 -04:00
kraem
45343beffe linux/hardened-patches/5.4.33: 5.4.33.NixOS-a -> 5.4.33.a 2020-04-20 10:05:36 -04:00
kraem
48d908b731 linux/hardened-patches/5.5.18: init at 5.5.18.a 2020-04-20 10:05:36 -04:00
kraem
0fd9293703 linux/hardened-patches/5.6.5: init at 5.6.5.a 2020-04-20 10:05:36 -04:00
kraem
e7a65e6c41 linux/hardened-patches/5.5.17: remove 2020-04-20 10:05:36 -04:00
kraem
eb41f8122e linux/hardened-patches/5.6.4: remove 2020-04-20 10:05:36 -04:00
kraem
8879086cfc linux: 5.5.17 -> 5.5.18 2020-04-20 10:05:36 -04:00
kraem
4307923b86 linux: 5.6.4 -> 5.6.5 2020-04-20 10:05:36 -04:00
Yegor Timoshenko
6f1165a0cb
Merge pull request #84522 from emilazy/add-linux-hardened-patches 
linux_*_hardened: use linux-hardened patch set
 2020-04-19 20:01:35 +03:00
Peter Simons
00222dbb0e bbswitch: fix build with Linux kernel version >= 5.6.0 
Fixes https://github.com/NixOS/nixpkgs/issues/85564.
 2020-04-19 16:25:48 +02:00
Maximilian Bosch
19de59a9be
Merge pull request #85334 from flokli/systemd-mainline2 
systemd: 243.7 -> 245
 2020-04-19 16:02:52 +02:00
Vladimír Čunát
e233a9d4dd
Merge #84442: staging-next branch 2020-04-18 23:11:00 +02:00
John Ericson
1ea80c2cc3 Merge remote-tracking branch 'upstream/master' into staging 2020-04-18 15:40:49 -04:00
Jan Tojnar
09c4736405
Merge pull request #83755 from jtojnar/jcat-0.1 2020-04-18 20:38:24 +02:00
Mario Rodas
e5dd52b99d
Merge pull request #85422 from marsam/update-lxc 
lxc: 4.0.1 -> 4.0.2
 2020-04-18 13:24:22 -05:00
Jan Tojnar
06e5800a73
fwupd: 1.3.9 → 1.4.0 
https://github.com/fwupd/fwupd/releases/tag/1.4.0
 2020-04-18 19:51:08 +02:00
Pavol Rusnak
fadcfc3ea4
treewide: per RFC45, remove more unquoted URLs 2020-04-18 14:04:37 +02:00
Vladimír Čunát
d96487b9ca
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1582510
 2020-04-18 07:42:26 +02:00
John Ericson
cc880cd91f Merge remote-tracking branch 'upstream/master' into staging 2020-04-17 18:50:55 -04:00
John Ericson
e99a409065
Merge pull request #85190 from Ericson2314/fwupdate 
fwupdate: Clean up -I flags
 2020-04-17 18:50:22 -04:00
John Ericson
33c2a76c5e Merge remote-tracking branch 'upstream/master' into staging 2020-04-17 18:40:51 -04:00
Emily
7fdfe5381d linux_*_hardened: don't set FORTIFY_SOURCE 
Upstreamed in anthraxx/linux-hardened@d12c0d5f0c.
 2020-04-17 16:13:39 +01:00
Emily
ed89b5b3f1 linux_*_hardened: don't set PANIC_ON_OOPS 
Upstreamed in anthraxx/linux-hardened@366e0216f1.
 2020-04-17 16:13:39 +01:00
Emily
0d5f1697b7 linux_*_hardened: don't set SLAB_FREELIST_{RANDOM,HARDENED} 
Upstreamed in anthraxx/linux-hardened@786126f177,
anthraxx/linux-hardened@44822ebeb7.
 2020-04-17 16:13:39 +01:00
Emily
4fb796e341 linux_*_hardened: don't set HARDENED_USERCOPY_FALLBACK 
Upstreamed in anthraxx/linux-hardened@c1fe7a68e3,
anthraxx/linux-hardened@2c553a2bb1.
 2020-04-17 16:13:39 +01:00
Emily
3eeb5240ac linux_*_hardened: don't set DEBUG_LIST 
Upstreamed in anthraxx/linux-hardened@6b20124185.
 2020-04-17 16:13:39 +01:00
Emily
0611462e33 linux_*_hardened: don't set {,IO_}STRICT_DEVMEM 
STRICT_DEVMEM is on by default in upstream 5.6.2; IO_STRICT_DEVMEM is
turned on by anthraxx/linux-hardened@103d23cb66.

Note that anthraxx/linux-hardened@db1d27e10e
disables DEVMEM by default, so this is only relevant if that default is
overridden to turn it back on.
 2020-04-17 16:13:39 +01:00
Emily
303bb60fb1 linux_*_hardened: don't set DEBUG_WX 
Upstreamed in anthraxx/linux-hardened@55ee7417f3.
 2020-04-17 16:13:39 +01:00
Emily
33b94e5a44 linux_*_hardened: don't set BUG_ON_DATA_CORRUPTION 
Upstreamed in anthraxx/linux-hardened@3fcd15014c.
 2020-04-17 16:13:39 +01:00
Emily
db6b327508 linux_*_hardened: don't set LEGACY_VSYSCALL_NONE 
Upstreamed in anthraxx/linux-hardened@d300b0fdad.
 2020-04-17 16:13:39 +01:00
Emily
130f6812be linux_*_hardened: don't set RANDOMIZE_{BASE,MEMORY} 
These are on by default for x86 in upstream linux-5.6.2, and turned on
for arm64 by anthraxx/linux-hardened@90f9670bc3.
 2020-04-17 16:13:39 +01:00
Emily
8c68055432 linux_*_hardened: don't set MODIFY_LDT_SYSCALL 
Upstreamed in anthraxx/linux-hardened@05644876fa.
 2020-04-17 16:13:39 +01:00
Emily
8efe83c22e linux_*_hardened: don't set DEFAULT_MMAP_MIN_ADDR 
Upstreamed in anthraxx/linux-hardened@f1fe0a64dd.
 2020-04-17 16:13:39 +01:00
Emily
3d4c8ae901 linux_*_hardened: don't set VMAP_STACK 
This has been on by default upstream for as long as it's been an option.
 2020-04-17 16:13:39 +01:00
Emily
7d5352df31 linux_*_hardened: don't set X86_X32 
As far as I can tell, this has never defaulted to on upstream, and our
common kernel configuration doesn't turn it on, so the attack surface
reduction here is somewhat homeopathic.
 2020-04-17 16:13:39 +01:00
Emily
0d4f35efd4 linux_*_hardened: use linux-hardened patch set 
This is an updated version of the former upstream,
https://github.com/AndroidHardeningArchive/linux-hardened, and provides
a minimal set of additional hardening patches on top of upstream.

The patch already incorporates many of our hardened profile defaults,
and releases are timely (Linux 5.5.15 and 5.6.2 were released on
2020-04-02; linux-hardened patches for them came out on 2020-04-03 and
2020-04-04 respectively).
 2020-04-17 16:13:39 +01:00
Emily
3d01e802bd linux: explicitly enable SYSVIPC 
The linux-hardened patch set removes this default, probably because of
its original focus on Android kernel hardening.
 2020-04-17 16:12:29 +01:00
Tim Steinbach
e341107367
linux: 5.4.32 -> 5.4.33 2020-04-17 08:34:01 -04:00
Tim Steinbach
d9258d33be
linux: 4.19.115 -> 4.19.116 2020-04-17 08:34:01 -04:00
Vladimír Čunát
acb4710214
alsaTools: 1.1.7 -> 1.2.2 
Fixes build regression (after alsa update, I assume).
Despite the version number change, the diff is trivial:
https://git.alsa-project.org/?p=alsa-tools.git;a=log;h=refs/tags/v1.2.2
 2020-04-17 13:49:20 +02:00
Florian Klink
b3f14109a8 systemd: explicitly disable portabled for now 
This hasn't worked with 243, let's disable it for now, until we have
tests and can ensure it works and keeps working.
 2020-04-17 00:31:03 +02:00
Florian Klink
ce7c1230ea systemd: explicitly disable homed for now 
We don't currently have tests to ensure it works and keeps working.

So instead of having it accidentially working, and possibly breaking it
in the future, disable it for now.
 2020-04-17 00:30:52 +02:00
Jörg Thalheim
c18ceab106 systemd: remove myself as maintainer 2020-04-17 00:30:52 +02:00
Florian Klink
b0b7f673dc systemd: 245 -> 245.3 2020-04-17 00:30:52 +02:00
Florian Klink
d2871a723a systemd: 244.3 -> 245 2020-04-17 00:30:51 +02:00
Florian Klink
9de0ac3770 systemd: 243.7 -> 244.3 
This required some changes in how we treat DEFAULT_PATH_NORMAL.
 2020-04-17 00:30:51 +02:00
Florian Klink
b4cbcba5b1 systemd: update paths kmod-static-nodes.service 
The previous patch just removed a `ConditionFileNotEmpty=…` line from
`kmod-static-nodes.service` referring to a location not existing on
NixOS. We know better, and can actually replace this Condition to point
to `run/booted-system/kernel-modules/lib/modules/%v/`, instead of just
patching it out.
 2020-04-17 00:28:58 +02:00
Florian Klink
a6710adab2 systemd: join 000{3,8}-Don-t-try-to-unmount-nix-or-nix-store.patch 2020-04-17 00:27:30 +02:00
Florian Klink
4f346cd849 systemd: drop 0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch 
This was simply undoing a hunk from
0008-Don-t-try-to-unmount-nix-or-nix-store.patch, so drop that one from
there and omit
0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch entirely.
 2020-04-17 00:27:29 +02:00
Florian Klink
a16ebf8561 systemd: drop 001{4,5}-{catalog,hwdb}-don-t-update-on-install.patch 
These patches removed logic in the meson install phase invoking
`journalctl --update-catalog` and `systemd-hwdb update`, which would
mutate the running system, and obviously fails in the sandbox.

Upstream also knows this is a bad thing if you're not on the machine you
want to deploy to, so there's logic in there to not execute it when
DESTDIR isn't empty. In our case, it is - as we set --prefix instead for
other reasons, but by just setting DESTIDIR to "/", we can still trigger
these things to be skipped.

The patches removed some context from
0018-Install-default-configuration-into-out-share-factory.patch, which
we need to introduce there to make that patch still apply.
 2020-04-17 00:27:29 +02:00
Florian Klink
1ad4accdaf systemd: drop 0027-Start-getty-on-lxc.patch 
Since quite some time, systemd starts getty on these consoles
automatically.
 2020-04-17 00:27:29 +02:00
Florian Klink
22bb3a6771 systemd: remove local-fs patch and revert of it 2020-04-17 00:27:29 +02:00
Florian Klink
ba770e599c systemd: switch from our own fork to upstream repo + local patches 
After patching, this produces exactly the same source code as in our
custom fork, but having the actual patches inlined inside nixpkgs makes
it easier to get rid of them.

In case more complicated rebasing is necessary, maintainers can

 - Clone the upstream systemd/systemd[-stable] repo
 - Checkout the current rev mentioned in src
 - Apply the patches from this folder via `git am 00*.patch`
 - Rebase the repo on top of a new version
 - Export the patch series via `git format-patch $newVersion`
 - Update the patches = [ … ] attribute (if necessary)
 2020-04-17 00:27:19 +02:00
Mario Rodas
fc7efb2d49
lxc: 4.0.1 -> 4.0.2 2020-04-16 04:20:00 -05:00
Jan Tojnar
4b706490da
Merge branch 'staging-next' into staging 2020-04-16 10:10:38 +02:00
Jan Tojnar
3d8e436917
Merge branch 'master' into staging-next 2020-04-16 10:09:43 +02:00
markuskowa
4289160b17
Merge pull request #85281 from r-ryantm/auto-update/rdma-core 
rdma-core: 28.0 -> 29.0
 2020-04-15 13:27:20 +02:00
R. RyanTM
d6d2b1ee6d rdma-core: 28.0 -> 29.0 2020-04-15 07:31:00 +00:00
Niklas Hambüchen
f16ae2da3e linux: Enable CONFIG_NET_DROP_MONITOR by default. 
Needed for subscribing to dropped packets (e.g. via `dropwatch`).
 2020-04-14 20:07:51 +02:00
Maximilian Bosch
401e07d419
Merge pull request #84551 from gnprice/pr-stripDebugList 
treewide: Fix types of stripDebugList attrs (and fix doc)
 2020-04-14 15:54:52 +02:00
John Ericson
17f2cf93dc fwupdate: Clean up -I flags 2020-04-13 19:21:23 -04:00
Matthew Bauer
e520d6af29
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020 
Cross compilation fixes [april 2020]
 2020-04-13 16:48:38 -04:00
Jan Tojnar
b4a6714571
Merge branch 'staging-next' into staging 2020-04-13 18:54:59 +02:00
Jan Tojnar
a04625379a
Merge branch 'master' into staging-next 2020-04-13 18:50:35 +02:00
Matthew Bauer
156c67858f
Merge pull request #85017 from r-ryantm/auto-update/android-udev-rules 
android-udev-rules: 20191103 -> 20200410
 2020-04-13 11:11:25 -04:00
Tim Steinbach
f6e64feb14
linux: 5.6.3 -> 5.6.4 2020-04-13 08:36:35 -04:00
Tim Steinbach
bba4a30f8c
linux: 5.5.16 -> 5.5.17 2020-04-13 08:36:27 -04:00
Tim Steinbach
2b6e16abe0
linux: 5.4.31 -> 5.4.32 2020-04-13 08:36:19 -04:00
Tim Steinbach
f47969645b
linux: 4.9.218 -> 4.9.219 2020-04-13 08:36:11 -04:00
Tim Steinbach
e06d2a4682
linux: 4.19.114 -> 4.19.115 2020-04-13 08:36:04 -04:00
Tim Steinbach
f717bfeedb
linux: 4.14.175 -> 4.14.176 2020-04-13 08:35:56 -04:00
Tim Steinbach
3a8f6159cb
linux: 4.4.218 -> 4.4.219 2020-04-13 08:35:32 -04:00
Maximilian Bosch
89d2967c9e
linuxPackages.bpftrace: 0.9.3 -> 0.9.4 
https://github.com/iovisor/bpftrace/releases/tag/v0.9.4
 2020-04-13 12:03:37 +02:00
R. RyanTM
b1d4fdad19 pam_krb5: 4.8 -> 4.9 2020-04-12 17:43:53 -07:00
R. RyanTM
1c0b645d7b
earlyoom: 1.5 -> 1.6 2020-04-12 09:09:57 +00:00
Edmund Wu
f9ac494891
rtkit: 0.11 -> 0.13 2020-04-11 21:36:43 -04:00
Edmund Wu
363004c7eb
rtkit: cleanup 2020-04-11 17:09:44 -04:00
R. RyanTM
64f80e3397 android-udev-rules: 20191103 -> 20200410 2020-04-11 18:24:40 +00:00
Matthieu Coudron
bc6b37e967 fixup! kernel: fix errors in configuration 2020-04-11 14:04:25 +02:00
Andreas Stührk
9ddfde8977 v4l2loopback: 0.12.3 -> 0.12.4 2020-04-10 14:22:11 -07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jan Tojnar
55a5c128d4
Merge branch 'staging-next' into staging 2020-04-10 12:13:27 +02:00
Jan Tojnar
1ab03c3a76
Merge branch 'master' into staging-next 2020-04-10 12:12:56 +02:00
Dmitry Kalinkin
98790dab3b
Merge pull request #84680 from lovesegfault/nvidia-x11-440.82 
linuxPackages.nvidia_x11: 440.64 -> 440.82
 2020-04-09 00:16:46 -04:00
Bernardo Meurer
73ff54e7b9
linuxPackages.nvidia_x11: 440.64 -> 440.82 2020-04-08 20:01:41 -07:00
Peter Hoeg
f14b43a54c
Merge pull request #84716 from peterhoeg/p/g15daemon 
g15daemon: init at 1.9.5.3
 2020-04-09 09:56:26 +08:00
Michael Weiss
b7bf29993b
Merge pull request #82298 from Ralith/netem 
iproute: include netem tools
 2020-04-08 19:05:59 +02:00
Michael Bishop
70308c5c56
device-tree_rpi: fix platforms 2020-04-08 12:54:58 -03:00
Jörg Thalheim
fe8875a363
Merge pull request #84597 from NixOS/acpi-call 
linuxPackages.acpi-call: switch to nix-community fork
 2020-04-08 15:34:01 +01:00
Jörg Thalheim
1ae03c9db1
linuxPackages.acpi-call: switch to nix-community fork 
This fixes also build against linux 5.6
We also took the opportunity to cleanup the build.
 2020-04-08 15:03:53 +01:00
Tim Steinbach
7bd91fe7af
linux: 5.6.2 -> 5.6.3 2020-04-08 08:51:08 -04:00
Tim Steinbach
1c637d2326
linux: 5.5.15 -> 5.5.16 2020-04-08 08:51:07 -04:00
Tim Steinbach
5653337922
linux: 5.4.30 -> 5.4.31 2020-04-08 08:51:07 -04:00
Peter Hoeg
0669cd72ae g15daemon: init at 1.9.5.3 2020-04-08 20:49:49 +08:00
Silvan Mosberger
b293421a69
Merge pull request #84129 from Infinisil/removing-python-from-grub 
Support removing python from zfs/grub closure
 2020-04-08 12:53:28 +02:00
Jörg Thalheim
b3a9a65955
Merge pull request #84595 from NixOS/zfs 
zfs: fix build against 5.6
 2020-04-08 10:14:11 +01:00
worldofpeace
d9a056953c
Merge pull request #81693 from lovesegfault/uvcdynctrl-udev 
uvcdynctrl: fix udev files
 2020-04-07 23:38:50 -04:00
worldofpeace
9fa5658672
Merge pull request #84161 from lovesegfault/ddcci-0.3.3 
ddcci: 0.3.2 -> 0.3.3
 2020-04-07 23:36:12 -04:00
R. RyanTM
53c6b76dc4 fwts: 20.02.00 -> 20.03.00 2020-04-07 19:35:21 -07:00
Silvan Mosberger
0a43c6e0f9
zfs: Add enablePython argument 
Reduces closure size with it disabled from 236.0M to 176.7M
 2020-04-08 02:29:03 +02:00
Jörg Thalheim
75c28ebdf7
zfs: fix build against 5.6 2020-04-07 13:00:55 +01:00
Michael Weiss
84867e44bf
Merge pull request #84134 from primeos/iproute2 
iproute: 5.5.0 -> 5.6.0
 2020-04-07 12:39:04 +02:00
Bernardo Meurer
fe9b7e6281
uvcdynctrl: fix udev files 2020-04-07 00:35:53 -07:00
Bernardo Meurer
79045d9051
linuxPackages.ddcci-driver: 0.3.2 -> 0.3.3 2020-04-07 00:34:54 -07:00
Greg Price
7547cf9dfc treewide: Fix up stripDebugList attrs to be lists. 
The documentation says this should be a list, and it already is in
about half the expressions that set it.

The difference doesn't matter at present, because these values are all
space-free literals.  But it will in a future with __structuredAttrs .

(The similar attr stripAllList has no users in the nixpkgs tree, so
there's nothing to do to fix any of those up.)
 2020-04-06 21:26:52 -07:00
Dmitry Kalinkin
9b0d2f3fd1
Merge pull request #84163 from lovesegfault/nvidia-x11-440.64 
linuxPackages.nvidia_x11: 440.59 -> 440.64
 2020-04-06 18:24:27 -04:00
Matthew Bauer
024877e7b2 alsa-plugins: move pkgconfig to native 2020-04-06 16:36:28 -04:00
Matthew Bauer
0bbdba2d11 bluez: don’t build python packages when tests are disabled 
Can’t run these on cross anyway
 2020-04-06 16:36:28 -04:00
Matthew Bauer
3a71e62c56 plymouth: set systemd-tty-ask-password-agent path 
This is needed in cross where systemd is not in path.
 2020-04-06 16:36:21 -04:00
Eelco Dolstra
50913242ab
Merge pull request #81500 from primeos/tcp-cong-switch-to-cubic 
linux config: Set TCP_CONG_CUBIC=yes to restore the default
 2020-04-06 17:11:31 +02:00
Jörg Thalheim
a737f030cf
Merge pull request #71481 from eadwu/bcachefs/update-10 
bcachefs: update 10
 2020-04-06 15:43:36 +01:00
Edmund Wu
04a5e5ab7c
linux_testing_bcachefs: 5.3.2020.03.25 -> 5.3.2020.04.04 2020-04-06 10:29:33 -04:00
Jörg Thalheim
b2aa0bbf46
Merge pull request #84422 from r-ryantm/auto-update/lxcfs 
lxcfs: 4.0.0 -> 4.0.1
 2020-04-06 13:17:41 +01:00
Michael Weiss
94f2a76718
iproute: Build the netem tools 
They will be installed now and we can provide $HOSTCC for
cross-compilation.

New files:
+lib/tc/experimental.dist
+lib/tc/normal.dist
+lib/tc/pareto.dist
+lib/tc/paretonormal.dist

Note: The distributions are generated in a reproducible way.

Co-Authored-By: Benjamin Saunders <ben.e.saunders@gmail.com>
 2020-04-06 14:00:06 +02:00
Michael Weiss
aa46e1ae34
iproute: Simplify and improve the expression 2020-04-06 13:56:48 +02:00
Mario Rodas
39f6269ec0
lxc: 4.0.0 -> 4.0.1 2020-04-06 04:20:00 -05:00
Frederik Rietdijk
2420184727 Merge staging into staging-next 2020-04-06 08:54:28 +02:00
R. RyanTM
a6d549c98f lxcfs: 4.0.0 -> 4.0.1 2020-04-06 03:47:09 +00:00
Mario Rodas
f16fb03d32
Merge pull request #84313 from r-ryantm/auto-update/procdump 
procdump: 1.1 -> 1.1.1
 2020-04-05 20:19:53 -05:00
Bernardo Meurer
408de509cc
linuxPackages.nvidia_x11: 440.59 -> 440.64 2020-04-05 14:01:28 -07:00
Graham Christensen
65d3a18576
Merge pull request #84387 from kraem/fix/facetimehd-linux-5.6 
facetimehd: update src to build with linux >= 5.6
 2020-04-05 16:28:50 -04:00
kraem
a5b0581cf7
facetimehd: update src to build with linux >= 5.6 
also add kraem to maintainers
 2020-04-05 22:14:54 +02:00
Frederik Rietdijk
98cefdd37f
Merge pull request #83155 from roastiek/alsa-upgrade 
alsa-lib: 1.1.9 -> 1.2.2 and new alsa conf packages
 2020-04-05 13:17:16 +02:00
Frederik Rietdijk
aaf632bdbb Merge staging-next into staging 2020-04-05 13:14:01 +02:00
Frederik Rietdijk
e50c67ad7e
Merge pull request #83618 from NixOS/staging-next 
Staging next
 2020-04-05 13:13:21 +02:00
Frederik Rietdijk
df77ecc99d zenpower: makeFlags is a list 2020-04-05 13:04:32 +02:00
R. RyanTM
bce6ea7f76 procdump: 1.1 -> 1.1.1 2020-04-05 04:31:22 +00:00
Frederik Rietdijk
edaa972160 Merge staging-next into staging 2020-04-03 21:55:10 +02:00
Frederik Rietdijk
92124ed660 Merge master into staging-next 2020-04-03 21:54:40 +02:00
Michael Weiss
41d6bfe0ca
iproute: 5.5.0 -> 5.6.0 
"Not a lot of changes in this release, most are related to fixing output
formatting and documentation." [0]

File changes (additions/removals):
+share/man/man8/tc-ets.8.gz
+share/man/man8/tc-fq_pie.8.gz

nix path-info -S:
5.5.0 51509616
5.6.0 51528680

[0]: https://marc.info/?l=linux-netdev&m=158585608413591
 2020-04-02 23:30:07 +02:00
Florian Klink
35916a8c4b Merge pull request #83658 from Emantor/topic/kernel-snd-ca0132 
linux config: enable Creative Soundblaster DSP loading
 2020-04-02 22:41:57 +02:00
Silvan Mosberger
848ed261f5
nfs-utils: Add enablePython argument 
If turned off, all binaries that need python are excluded

With the argument disabled, this reduces closure size from 219.5M to
160.3M
 2020-04-02 21:42:59 +02:00
Tim Steinbach
c36ec10158
linux: 4.9.217 -> 4.9.218 2020-04-02 14:03:09 -04:00
Tim Steinbach
e2df587f25
linux: 4.4.217 -> 4.4.218 2020-04-02 14:03:02 -04:00
Tim Steinbach
782db49b5a
linux: 4.14.174 -> 4.14.175 2020-04-02 14:02:48 -04:00
Tim Steinbach
4fbd9e3ab8
linux: 5.6.1 -> 5.6.2 2020-04-02 10:03:15 -04:00
Tim Steinbach
f2025f2d6d
linux: 5.5.14 -> 5.5.15 2020-04-02 10:03:07 -04:00
Tim Steinbach
bf0b6ab809
linux: 5.4.29 -> 5.4.30 2020-04-02 10:02:52 -04:00
Tim Steinbach
d47ba3e4b5
linux: 4.19.113 -> 4.19.114 2020-04-02 10:02:40 -04:00
Maximilian Bosch
b503b2c75f
linuxPackages.wireguard: 0.0.20200318 -> 1.0.20200401 
https://lists.zx2c4.com/pipermail/wireguard/2020-April/005237.html

Resolves #84009
 2020-04-01 22:42:15 +02:00
Matthieu Coudron
121b17e1ac kernel: fix errors in configuration 
With the fix in kernel configuration merging, some kernel configuration items
marked as mandatory now correctly trigger an error when unused (while they
previously were unused).
 2020-04-01 22:28:53 +02:00
Matthieu Coudron
b9a4e6953d kernel: fix config generation 
Addresses https://github.com/NixOS/nixpkgs/issues/71803:
Kernel options are not merged as described, especially the "optional"
aspects. The error silences legitimate warnings.
 2020-04-01 22:25:57 +02:00
Alexander Bakker
79e768eeb4 zenpower: 0.1.5 -> 0.1.10 2020-04-01 18:28:43 +00:00
Tim Steinbach
ef3f3f2728
linux_latest-libre: 17387 -> 17402 2020-04-01 10:46:07 -04:00
Tim Steinbach
902ebcdd44
linux: 5.5.13 -> 5.5.14 2020-04-01 10:46:06 -04:00
Tim Steinbach
7bae57f249
linux: 5.4.28 -> 5.4.29 2020-04-01 10:46:06 -04:00
Tim Steinbach
7f56fdd997
linux: Init 5.6.1 
Change linux_latest to 5.6
 2020-04-01 10:46:02 -04:00
Jan Tojnar
dbb4a47de0
Merge branch 'staging-next' into staging 2020-03-31 21:33:00 +02:00
Jan Tojnar
3e0f4e202f
Merge branch 'master' into staging-next 2020-03-31 21:32:15 +02:00
gtgteq
a8811cb82b sssd: Port to samba-4.12 2020-03-31 21:09:42 +02:00
Jörg Thalheim
4007e80d00
Merge pull request #83784 from Mic92/sysdig 
sysdig: 0.26.5 -> 0.26.6
 2020-03-31 08:23:18 +01:00
Jon
58c96b5224
Merge pull request #83841 from r-ryantm/auto-update/undervolt 
undervolt: 0.2.9 -> 0.2.11
 2020-03-30 22:27:28 -07:00
R. RyanTM
6279efe3cd undervolt: 0.2.9 -> 0.2.11 2020-03-31 04:31:33 +00:00
Ryan Mulligan
97f404147e
Merge pull request #82993 from Synthetica9/homepage-fix2 
treewide: fix redirected urls (again)
 2020-03-30 13:40:46 -07:00
Jörg Thalheim
748f8b725c
sysdig: 0.26.5 -> 0.26.6 2020-03-30 16:29:13 +01:00
Frederik Rietdijk
46ec52f329 buildPython*: use pname 2020-03-30 17:07:41 +02:00
Benjamin Hipple
504579f371
Merge pull request #83128 from michojel/ffado-2.4.2 
ffado: 2.4.1 -> 2.4.2
 2020-03-29 23:19:17 -04:00
Michal Minář
dd2e6d3d4a quoted home page URL according to RFC 0045 
Signed-off-by: Michal Minář <mic.liamg@gmail.com>
 2020-03-30 05:16:53 +02:00
Profpatsch
bf3bd5fee1 skawarePackages: support static builds via pkgsStatic 
Most of the skaware packages already build just fine with pkgsStatic,
however the wrapper scripts for execline and stdnotify-wrapper needed
the `-lskarlib` argument to go at the end.

`utmps` and `nsss` still fail with this error:

```
exec ./tools/install.sh -D -m 600 utmps-utmpd /bin/utmps-utmpd
/build/utmps-0.0.3.1/tools/install.sh: line 48: can't create /bin/utmps-utmpd.tmp.479: Permission denied
make: *** [Makefile:121: /bin/utmps-utmpd] Error 1
```
 2020-03-30 01:35:39 +02:00
Profpatsch
49be064fa5 skawarePackages: release 2020-03 
Hello,

  New versions of all the skarnet.org packages are available.
This is mostly a bugfix release (there was an installation bug in
some circumstances with shared libraries) but some packages, notably
execline and s6, have new, useful features.

  The new versions are the following:

skalibs-2.9.2.0
nsss-0.0.2.2
utmps-0.0.3.2
execline-2.6.0.0
s6-2.9.1.0
s6-rc-0.5.1.2
s6-linux-init-1.0.4.0
s6-dns-2.3.2.0
s6-networking-2.3.1.2
s6-portable-utils-2.2.2.2
s6-linux-utils-2.5.1.2
mdevd-0.1.1.2
bcnm-0.0.1.0

  Here are details for the packages that have more than bugfixes:

* skalibs-2.9.2.0
   ---------------

  - New header: skalibs/bigkv.h. It's a set of functions allowing
efficient lookups in a large set of strings (typically read from the
command line or the environment).

  https://skarnet.org/software/skalibs/
  git://git.skarnet.org/skalibs

  * execline-2.6.0.0
    ----------------

  - It's a major release because an API has been modified: dollarat.
Beforehand, dollarat's -0 option would always prevail over any -d
option. Now, dollarat has its conflicting -0 and -d options handled
in the conventional way, with rightmost priority.

  - The runblock program now accepts a command line prefix, which is
given as runblock's own command line. This allows blocks to serve as
arguments to a new command, instead of having to be full command lines
by themselves.

  - New binary: posix-umask.

  - The former "cd" program is now named "execline-cd" and the former
"umask" program is named "execline-umask". When the=20
--enable-pedantic-posix
option is not given at configure time, "cd" and "umask" are symbolic
links created at installation time and pointing to execline-cd and
execline-umask respectively. When the --enable-pedantic-posix option is
given, the symbolic links point to posix-cd and posix-umask instead.

  - With posix-cd and posix-umask (and the changes to wait done in the
previous version), execline is now fully POSIX-compliant when built with
the --enable-pedantic-posix option. This will certainly, without the
slightest hint of a doubt, change distributions' attitudes about it.

  https://skarnet.org/software/execline/
  git://git.skarnet.org/execline

  * s6-2.9.1.0
    ----------

  - A new '?' directive has been added to s6-log. It behaves exactly like
'!', except that it spawns the given processor with /bin/sh as an
interpreter instead of execlineb.

  - execline support is now optional: it can be disabled by specifying
--disable-execline at configure time. Some functionality is unavailable
when execline support is disabled:
    * s6-log's '!' directive
    * s6-notifyoncheck's -c option
    * s6-ipcserver-access's support for 'exec' directives in a ruleset

  - A new -X option has been added to s6-svscan, to specify a descriptor
that will be passed as stderr to a service spawned by this s6-svscan and
named s6-svscan-log. This is used in the new s6-linux-init, to avoid
needing to hardcode the /dev/console name for the catch-all logger's
standard error.

  - On systems that define SIGPWR and SIGWINCH, s6-svscan -s now diverts
those signals. This allows powerfail and kbrequest events to be handled
when s6-svscan runs as process 1.

  https://skarnet.org/software/s6/
  git://git.skarnet.org/s6

  * s6-linux-init-1.0.4.0
    ---------------------

  - New options have been added to s6-linux-init-maker: to support
running s6-linux-init without a catch-all logger, and to support running
it in a container.

  - s6-linux-init-maker now adds a SIGPWR handler to the default image:
on receipt of a SIGPWR, the system's shutdown procedure is triggered.

  - s6-linux-init now handles kbrequest, which triggers a SIGWINCH in
init when a special, configurable set of keys is pressed. By default,
no SIGWINCH handler is declared in the image, and no set of keys is
bound to kbrequest.

  https://skarnet.org/software/s6-linux-init/
  git://git.skarnet.org/s6-linux-init

  * s6-dns-2.3.2.0
    --------------

  - New library: libdcache, implementing a clean cache structure
to contain DNS data. It's still not used at the moment.

  https://skarnet.org/software/s6-dns/
  git://git.skarnet.org/s6-dns

  * bcnm-0.0.1.0
    ------------

  - First numbered release, because the Ad=C3=A9lie Linux distribution,
which uses libwpactrl, needs an official release instead of pulling
from git.

  - libwpactrl is a set of C functions helping control a wpa_supplicant
process.

  - bcnm-waitif is a binary that waits for network interface state
events such as appearance/disappearance, up/down, running/not-running.
It is useful to avoid race conditions during a boot sequence, for
instance.

  https://skarnet.org/software/bcnm/
  git://git.skarnet.org/bcnm

  Enjoy,
  Bug-reports welcome.

--
  Laurent
 2020-03-30 01:23:46 +02:00
Tim Steinbach
c76bad0ec0
linux: 5.6-rc5 -> 5.6-rc7 2020-03-29 16:50:02 -04:00
Rouven Czerwinski
62cdbd678c linux config: enable SND CA0132 DSP loading 
Since we select everything as a module, snd_hda_codec_ca0132 is built as
well. DSP loading is not enabled by default, but without it the
soundcard produces timeouts within ALSA and does not emit sound.
Explicitly enable the firmware loading to ensure Soundblaster
Z/Zx/ZxR/Recon devices can be used with NixOS.
The patch to enable this by default in the kernel is staged for 5.8.
 2020-03-29 21:11:17 +02:00
Rostislav Benes
4fef426da6 alsaLib: 1.1.9 -> 1.2.2 2020-03-29 20:34:06 +02:00
Rostislav Benes
f0a6dfcbdf alsa-topology-conf: init at 1.2.2 2020-03-29 20:34:06 +02:00
Rostislav Benes
4acda90e5a alsa-ucm-conf: init at 1.2.2 2020-03-29 20:34:06 +02:00
Jörg Thalheim
ac45e96d2f
Merge pull request #83220 from dasj19/linux-libre-fix 
linux-libre: added --force flag for deblobbing.
 2020-03-29 15:03:22 +01:00
Frederik Rietdijk
a36be028f5 Merge staging-next into staging 2020-03-28 21:15:15 +01:00
Ryan Mulligan
9e12173950
Merge pull request #83242 from r-ryantm/auto-update/pcm 
pcm: 201902 -> 202003
 2020-03-28 08:39:14 -07:00
Michael Raskin
7dc2439a1b
Merge pull request #83515 from snicket2100/firejail-fix 
firejail: local profile handling fixed
 2020-03-28 10:34:39 +00:00
Patrick Hilhorst
5b49816cf4
treewide: add quotes to recently-changed urls 
Co-Authored-By: Drew <drewrisinger@users.noreply.github.com>
 2020-03-28 00:05:50 +01:00
Michael Weiss
0950324466 scons: Add passthru.py2 for backward compatibility 
Not all packages build with Python 3, see #75877. The goal is to get rid
of Python 2 but this approach ensures a smoother transition.
 2020-03-27 10:49:52 -07:00
snicket2100
a63f6a7d47 firejail: local profile handling fixed 
made it possible to place local profiles in `~/.config/firejail`,
as well as in `/etc/firejail`.
 2020-03-27 18:34:52 +01:00
Jörg Thalheim
066db11215
Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin" 
This reverts commit 4e6bf03504, reversing
changes made to afd997aab6.

Instead we propagate those frameworks from the compiler again
 2020-03-27 07:33:21 +00:00
Maximilian Bosch
0e69720f34
iwd: 1.5 -> 1.6 2020-03-27 01:29:01 +01:00
Maximilian Bosch
79cc0c7e9f
ell: 0.28 -> 0.30 2020-03-27 01:29:01 +01:00
Edmund Wu
00e7a675f7
linux_testing_bcachefs: 5.2.2019.10.12 -> 5.3.2020.03.25 2020-03-26 12:12:43 -04:00
Michael Weiss
14e1f448f0
fscrypt-experimental: 0.2.6 -> 0.2.7 2020-03-25 21:11:19 +01:00
Tim Steinbach
ec87ed26e6
linux: 5.5.11 -> 5.5.13 2020-03-25 13:03:19 -04:00
Tim Steinbach
bec620d85b
linux: 5.4.27 -> 5.4.28 2020-03-25 13:03:10 -04:00
Tim Steinbach
9105efdcde
linux: 4.19.112 -> 4.19.113 2020-03-25 13:02:56 -04:00
Mario Rodas
f174ada91d
lxc: 3.2.1 -> 4.0.0 2020-03-24 04:20:00 -05:00
R. RyanTM
899f698592 earlyoom: 1.3 -> 1.5 2020-03-24 10:25:25 -07:00
Tor Hedin Brønner
1de8610ed2
udisks2: fix tests 2020-03-24 07:11:00 +01:00
R. RyanTM
7f230a7fa6 pcm: 201902 -> 202003 2020-03-23 20:40:00 +00:00
Daniel Șerbănescu
8431497dd2 linux-libre: added --force flag for deblobbing. 2020-03-23 16:07:13 +01:00
Michal Minář
22327eab2d switched from the current system to the booted one 
Signed-off-by: Michal Minář <mic.liamg@gmail.com>
 2020-03-23 10:03:36 +01:00
Orivej Desh
1b89aa3f7a Merge branch 'master' into staging 2020-03-23 00:53:16 +00:00
markuskowa
a9d7a1ee5b
Merge pull request #81277 from markuskowa/upd-rdma-core 
nixos/rdma-core: 27.0 -> 28.0, update RXE module
 2020-03-22 18:01:09 +01:00
Tim Steinbach
f0d17c2a17
linux_latest-libre: 17322 -> 17387 2020-03-22 12:05:45 -04:00
Tim Steinbach
8055a37aca
linux: 5.5.9 -> 5.5.11 2020-03-22 12:05:34 -04:00
Tim Steinbach
05716b70b0
linux: 5.4.25 -> 5.4.27 2020-03-22 12:05:08 -04:00
Tim Steinbach
07ffdf9de3
linux: 4.9.216 -> 4.9.217 2020-03-22 12:04:42 -04:00
Tim Steinbach
04d15d1839
linux: 4.4.216 -> 4.4.217 2020-03-22 12:04:20 -04:00
Tim Steinbach
8e278a8e2d
linux: 4.19.109 -> 4.19.112 2020-03-22 12:03:57 -04:00
Tim Steinbach
1315193c36
linux: 4.14.173 -> 4.14.174 2020-03-22 12:02:43 -04:00
Mario Rodas
4e6bf03504
Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin 
treewide: fix buildGoModule packages on darwin
 2020-03-22 08:13:37 -05:00
Michal Minář
bb317ecbc6 ffado: 2.4.1 -> 2.4.2 
- fixed ffado-diag
- fixed ffado-mixer
- enabled ffado-test

Signed-off-by: Michal Minář <mic.liamg@gmail.com>
 2020-03-22 11:55:57 +01:00
Matthew Bauer
b94300945a
Merge pull request #75940 from davidtwco/wooting-init 
wooting: init wootility, wooting-udev-rules and module
 2020-03-22 02:03:52 -04:00
Michael Weiss
68e9ddacc2
fuse3: 3.9.0 -> 3.9.1 (#82999) 2020-03-21 21:41:37 +01:00
Mario Rodas
78f00558e2 smimesign: fix build on darwin 2020-03-21 06:22:00 -05:00
Patrick Hilhorst
9fc5e7e473
treewide: fix redirected urls (again) 
Ran the same script as #78265.
Additionally, manually replaced `http://goodies.xfce.org`
with https.
 2020-03-20 13:36:23 +01:00
Maximilian Bosch
e758e95c1d
linuxPackages.wireguard: 0.0.20200215 -> 0.0.20200318 
https://lists.zx2c4.com/pipermail/wireguard/2020-March/005188.html
 2020-03-19 08:42:34 +01:00
R. RyanTM
8c514e9e7b bluez: 5.53 -> 5.54 2020-03-18 22:04:03 -07:00
Matthew Bauer
67b0ddf3f3 Merge remote-tracking branch 'origin/staging' into mb-cross-fixes-march-2020 2020-03-16 14:34:03 -04:00
Frederik Rietdijk
0c13b0d7d3 Merge staging-next into staging 2020-03-14 14:34:59 +01:00
Graham Christensen
244178e166
Merge pull request #82006 from emilazy/enable-linux-hardened-ia32-emulation 
linuxPackages_{,_latest,_testing}_hardened: enable 32-bit emulation
 2020-03-14 09:20:58 -04:00
Tim Steinbach
f9fcf29ef2
linux: 5.4.24 -> 5.4.25 2020-03-14 04:58:48 -04:00
Scott Worley
619a350e4a nettools: 1.60_p20170221182432 -> 1.60_p20180626073013 
Because _p2017... cannot be fetched: 404.

The change is minimal: Adjusting whether usage messages are printed to
stdout or stderr.

It's hard to find stable source links for nettools and we resort to
fetching patched sources out of other distros' tarball caches because
this package is deprecated:
  https://lwn.net/Articles/710533/
  https://lwn.net/Articles/710535/
  https://wiki.linuxfoundation.org/networking/iproute2

The advice is to switch to iproute2, but NixOS activation scripts use
`domainname` from nettools, for which neither iproute2 nor systemd
offers a replacement.  I inquired about this on iproute2's mailing list:
  https://lore.kernel.org/netdev/CAPwpnyTDpkX2hxiqYLxTuMM38cq+whPSC0yoee-YPLEAwfvqpQ@mail.gmail.com/
 2020-03-14 01:37:38 +00:00
John Ericson
84497cabd1 Merge remote-tracking branch 'upstream/master' into staging 2020-03-13 17:39:11 -04:00
Mario Rodas
342a62bcbf
Merge pull request #82193 from r-ryantm/auto-update/sdparm 
sdparm: 1.10 -> 1.11
 2020-03-12 21:33:56 -05:00
ajs124
2d364c6793 apparmor: 2.13.3 -> 2.13.4 
drop patches that were merged upstream
 2020-03-12 23:42:43 +00:00
Silvan Mosberger
eff447b321
Merge pull request #70157 from teto/lib_kernel 
Add lib.kernel
 2020-03-12 23:53:42 +01:00
Tim Steinbach
cd167a02b8
linux: 5.6-rc3 -> 5.6-rc5 2020-03-12 05:57:21 -04:00
Tim Steinbach
85c46f5a5a
linux: 5.5.8 -> 5.5.9 2020-03-12 05:57:20 -04:00
Tim Steinbach
930fc70bfc
linux: 4.9.215 -> 4.9.216 2020-03-12 05:57:20 -04:00
Tim Steinbach
3d12317a7e
linux: 4.4.215 -> 4.4.216 2020-03-12 05:57:20 -04:00
Tim Steinbach
24898ff826
linux: 4.19.108 -> 4.19.109 2020-03-12 05:57:20 -04:00
Tim Steinbach
ff6e097af1
linux: 4.14.172 -> 4.14.173 2020-03-12 05:57:19 -04:00
Ryan Mulligan
8a2ca6cd98
Merge pull request #81906 from r-ryantm/auto-update/ipset 
ipset: 7.5 -> 7.6
 2020-03-11 15:16:08 -07:00
peelz
3eea746d74 r8125: init at 9.003.02 2020-03-10 10:37:15 -07:00
Orivej Desh
1aeaf9387a libbpf: 0.0.3pre114 -> 0.0.7 
Fixes #82153
 2020-03-09 23:25:57 +00:00
R. RyanTM
ab021ffbb9 sdparm: 1.10 -> 1.11 2020-03-09 22:09:17 +00:00
Jörg Thalheim
e73596d077
Merge pull request #82140 from Mic92/bcc 
bcc: 0.12.0 -> 0.13.0
 2020-03-09 18:08:32 +00:00
Mario Rodas
38345f6db7
Merge pull request #81944 from r-ryantm/auto-update/openvswitch 
openvswitch: 2.12.0 -> 2.13.0
 2020-03-09 08:06:36 -05:00
Jörg Thalheim
0bfada7dda
bcc: 0.12.0 -> 0.13.0 2020-03-09 11:47:35 +00:00
Peter Hoeg
ddd7d2567a
Merge pull request #81012 from sjau/evdi-2020-02-25 
EVDI: 2019-01-16 -> 2019-02-25
 2020-03-09 14:30:17 +08:00
Mario Rodas
a895612946
Merge pull request #82070 from r-ryantm/auto-update/lxcfs 
lxcfs: 3.1.2 -> 4.0.0
 2020-03-08 20:48:29 -05:00
Mario Rodas
b93b8a5c8f
Merge pull request #81824 from r-ryantm/auto-update/open-iscsi 
openiscsi: 2.1.0 -> 2.1.1
 2020-03-08 20:44:45 -05:00