zowoq
7996eebcae
Merge master into staging-next
2021-08-02 07:36:39 +10:00
Robert Hensing
151c2f5a20
Merge pull request #131814 from blaggacao/fix-nix-daemon-registry-type-unspecified-error
...
nixos/nix-daemon: fix registry flake type
2021-08-01 22:43:34 +02:00
Aaron Andersen
4fad3a2b69
Merge pull request #131020 from Artturin/uptimed-fix
...
uptimed nixos/uptimed: switch to /var/lib/ and fix perms
2021-08-01 15:58:36 -04:00
Aaron Andersen
7841f5f4eb
Merge pull request #129861 from vs49688/giteafix
...
modules/gitea: use gitea to refresh hooks and keys
2021-08-01 15:57:11 -04:00
David Arnold
ecae25c3ef
nixos/nix-daemon: fix registry flake type
...
Before this commit, the `flake` option was typed with `types.unspecified`.
This type get's merged via [`mergeDefaultOption`](ebb592a04c/lib/options.nix (L119-L128)
), which has a line
```nix
else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list)
```
`lib.isFunction` detects an attrs in the shape of `{__functor = ...}` as
a function and hence this line substitutes such attrs with a function
(f: f x).
If now, a flake input has a `__functor` as it's output, this will
coerce the once attrs to a function. This breaks a lot of things later
in the stack, for example a later `lib.filterAttrs seive <LAMBDA>` will
fail for obious reasons.
According to @infinisil, `types.unspecified` is due to deprecation. In
the meantime this PR provides a specific fix for the specific problem
discovered.
2021-08-01 14:56:13 -05:00
ajs124
863a26e380
Merge pull request #132329 from Mic92/tt-rss-plugin-auth-ldap
...
tt-rss-plugin-auth-ldap: fix compat with latest tt-rss
2021-08-01 21:24:11 +02:00
Luke Granger-Brown
142da94468
Merge pull request #132345 from lukegb/fix-eval
...
nixos/virtualbox-image: cast baseImageFreeSpace to str
2021-08-01 20:15:46 +01:00
ajs124
cf44857e06
Merge pull request #131780 from r-ryantm/auto-update/icingaweb2-ipl
...
icingaweb2-ipl: 0.6.0 -> 0.6.1
2021-08-01 21:15:26 +02:00
Luke Granger-Brown
b5fab53628
nixos/virtualbox-image: cast baseImageFreeSpace into str
...
This fixes an evaluation error that's blocking the nixos-unstable
channel (#132328 ).
2021-08-01 18:59:08 +00:00
Robert Hensing
29c76b8c02
Merge pull request #132322 from dywedir/broot
...
broot: 1.6.0 -> 1.6.2
2021-08-01 20:42:22 +02:00
Robert Hensing
70369dbba0
Merge pull request #132331 from sternenseemann/pkgs-llvm-stdenv-trunk
...
pkgs/top-level/release.nix: build pkgsLLVM.stdenv as part of trunk
2021-08-01 20:32:18 +02:00
Vinícius Müller
2c79ed4585
vimPlugins.onedark-nvim: Add lush-nvim dependency ( #131987 )
...
* vimPlugins.onedark-nvim: Add lush-nvim dependency
* Update pkgs/misc/vim-plugins/overrides.nix
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-08-01 20:12:02 +02:00
Benjamin Asbach
f22a7ae1a8
soapui: 5.5.0 -> 5.6.0 ( #131307 )
...
Co-authored-by: Benjamin Asbach <asbachb@users.noreply.github.com>
2021-08-01 20:11:12 +02:00
David Reaver
9fc2cddf24
1password: 1.9.1 -> 1.11.2 ( #131497 )
...
* 1password: 1.9.1 -> 1.11.2
Also, we are using the new `apple_universal` package 1password added
to support amd64 and the new M1 architecture. If this is a problem, we
can revert to 1.11.0 for now, which is the last version that uses the
old `darwin_amd64` package.
Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
2021-08-01 12:18:03 -05:00
sternenseemann
0307a8af6c
pkgs/top-level/release.nix: build pkgsLLVM.stdenv as part of trunk
...
Having pkgsLLVM.stdenv built with nixpkgs:trunk will make building
anything in pkgsLLVM decidedly less painful since it will eliminate
the need to build LLVM and clang locally, which shouldn't be as bad
on hydra.
Darwin is disabled for now since it doesn't evaluate correctly there
(infinite recursion problem with the SDK).
2021-08-01 19:12:43 +02:00
Maximilian Bosch
f49c480094
Merge pull request #132235 from Ma27/bump-epson-escpr2
...
epson-escpr2: 1.1.34 -> 1.1.38
2021-08-01 19:08:33 +02:00
Michael Weiss
26b389e0b9
Merge pull request #132332 from primeos/chromium
...
chromium: Drop two gn overrides that are not required anymore
2021-08-01 18:49:34 +02:00
Michael Weiss
2682531c67
chromium: Drop two gn overrides that are not required anymore
...
The chromium and chromiumBeta builds still succeed.
2021-08-01 18:28:08 +02:00
Jörg Thalheim
88a326a926
tt-rss-plugin-auth-ldap: fix compat with latest tt-rss
2021-08-01 18:21:23 +02:00
Alyssa Ross
3669b12f35
lib.systems: add m68k-netbsd support
...
m68k was recently added for Linux and none, but NetBSD also supports
m68k. Nothing will build yet, but I want to make sure we at least
encode the existence of NetBSD support for every applicable
architecture we support for other operating systems.
2021-08-01 15:27:12 +00:00
Alyssa Ross
173a37e7b5
lib.systems.doubles: re-sort
...
These were alphabetically sorted until m68k and s390 were added.
2021-08-01 15:27:12 +00:00
Vladyslav M
cd3cb8a9e4
broot: 1.6.0 -> 1.6.2
2021-08-01 18:24:16 +03:00
Vladyslav M
ac7935480a
broot: add dywedir to maintainers
2021-08-01 18:22:09 +03:00
Vladimír Čunát
fd6fc2cae2
Merge #131965 : knot-resolver: 5.3.2 -> 5.4.0
2021-08-01 16:55:55 +02:00
Lassulus
3b4f4560d2
Merge pull request #132312 from ncfavier/syncthing-init
...
nixos/syncthing: fix curl not retrying on network errors
2021-08-01 16:52:19 +02:00
Fabian Affolter
c649b93603
Merge pull request #132304 from zowoq/gdu
...
gdu: 5.3.0 -> 5.5.0
2021-08-01 16:26:40 +02:00
Naïm Favier
12bbb0fd7b
nixos/syncthing: fix curl not retrying on network errors
2021-08-01 15:03:41 +02:00
Ryan Mulligan
6702c6c806
Merge pull request #131922 from r-ryantm/auto-update/icingaweb2
...
icingaweb2: 2.9.0 -> 2.9.2
2021-08-01 06:01:35 -07:00
github-actions[bot]
adcbf069c5
Merge master into staging-next
2021-08-01 12:01:19 +00:00
Profpatsch
6376458424
sane: Add support for the unfree Fujitsu ScanSnap drivers
...
This adds the scanner files already linked from the
`etc/sane.d/epjitsu.conf` file, which are extracted from the Windows
drivers and mirrored on GitHub.
Being a Japanese hardware vendor, Fujitsu’s software release &
licensing methods are horrifying, but their scanners are some of the
best, so we should definitly have discoverable support for them, which
this patch hopefully adds.
Inspiration was taken from the following sources:
https://www.josharcher.uk/code/install-scansnap-s1300-drivers-linux/
https://ubuntuforums.org/archive/index.php/t-1461915.html
https://github.com/stevleibelt/scansnap-firmware
2021-08-01 13:45:46 +02:00
Jörg Thalheim
cc2c11d543
Merge pull request #132271 from angustrau/pulseaudio-aarch64-darwin
...
pulseaudio: fix build on aarch64-darwin
2021-08-01 12:35:16 +01:00
zowoq
1005c971f5
gdu: 5.3.0 -> 5.5.0
...
https://github.com/dundee/gdu/releases/tag/v5.4.0
https://github.com/dundee/gdu/releases/tag/v5.5.0
2021-08-01 21:34:35 +10:00
Robert Hensing
ab5b6828af
Merge pull request #132292 from JJJollyjim/passthru-squashfs
...
squashfsTools: add NixOS cdrom boot as passthru test
2021-08-01 12:37:00 +02:00
Fabian Affolter
dd153421ed
Merge pull request #132296 from fabaff/bump-dipy
...
python3Packages.dipy: 1.3.0 -> 1.4.1
2021-08-01 12:32:11 +02:00
Fabian Affolter
0ffc6df2a0
Merge pull request #132291 from fabaff/fix-perfplot
...
python3Packages.perfplot: 0.9.5 -> 0.9.6
2021-08-01 12:13:11 +02:00
Fabian Affolter
df6712e3d7
Merge pull request #131703 from fabaff/bump-apispec
...
python3Packages.apispec: 4.7.0 -> 4.7.1
2021-08-01 12:12:25 +02:00
Fabian Affolter
976fbe0f13
python3Packages.dipy: 1.3.0 -> 1.4.1
2021-08-01 12:09:34 +02:00
Fabian Affolter
abdd33edea
python3Packages.pyfma: fix build
2021-08-01 11:48:12 +02:00
Jamie McClymont
2808286add
squashfsTools: add NixOS cdrom boot as passthru test
...
This is the same test which blocks nixos-unstable-small. It recently
caused a long blockage, due to a regression in squashfsTools itself
corrupting the iso image, see #132286 .
2021-08-01 21:35:10 +12:00
Vladimír Čunát
bc3416a2dd
squashfsTools: patch a channel-blocking bug
...
Fixes #132286 .
2021-08-01 11:30:06 +02:00
Angus Trau
85a09cf3a3
pulseaudio: fix build on aarch64-darwin
2021-08-01 19:15:40 +10:00
Fabian Affolter
5b683507ec
python3Packages.perfplot: 0.9.5 -> 0.9.6
2021-08-01 11:11:21 +02:00
Fabian Affolter
a5d975648d
python3Packages.dufte: 0.2.12 -> 0.2.27
2021-08-01 11:10:05 +02:00
Jörg Thalheim
9254bf3607
Merge pull request #131312 from Lassulus/vbox-size
...
vbox-image: add new option to set free space in image
2021-08-01 10:07:35 +01:00
Jörg Thalheim
53175c2f9f
Merge pull request #132197 from aaronjanse/aj2021jul-tahoe
...
tahoe-lafs: 1.13.0 -> 2021-07-09
2021-08-01 09:33:42 +01:00
Aaron Janse
7c312a6cf9
tahoe-lafs: 1.13.0 -> 2021-07-09
2021-08-01 01:12:36 -07:00
Jörg Thalheim
6e66276fe7
Merge pull request #132285 from NixOS/eksctl
...
eksctl: 0.58.0 -> 0.59.0
2021-08-01 09:11:19 +01:00
Jörg Thalheim
bbd05c5a61
Merge pull request #132236 from r-ryantm/auto-update/corral
...
pony-corral: 0.5.1 -> 0.5.3
2021-08-01 08:52:07 +01:00
R. RyanTM
6e4c660f49
eksctl: 0.58.0 -> 0.59.0
2021-08-01 09:49:02 +02:00
Jörg Thalheim
adf2a047ae
Merge pull request #132213 from cas1no/master
...
viber: add 'QML2_IMPORT_PATH' to the wrap
2021-08-01 08:43:50 +01:00