3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

304728 commits

Author SHA1 Message Date
David Arnold c219fdffad
nixos/installer: force root fs type
installer media can be used on top of existing host configs. In such
scenarions, root fs types will already be defined.

Before this change, this will inevitably lead to the following error:
```console
error: The option `fileSystems./.fsType' has conflicting definition values:
       - In `/nix/store/2nl5cl4mf6vnldpbxhrbzfh0n8rsv9fm-source/DevOS/os/hardware/common.nix': "ext4"
       - In `/nix/store/jbch90yqx6gg1h3fq30jjj2b6h6jfjgs-source/nixos/modules/installer/cd-dvd/iso-image.nix': "tmpfs"
```

With this patch, the installers will override those values according to
their own local requirement.

Use `mkOverride 60` so that conscientious overriding specially targeted
at the installer, e.g. with `mkForce` is still straight forward.
2021-07-28 15:05:25 -05:00
ajs124 0efb458bc1
Merge pull request #131649 from nlewo/postfix-3.6.2
Postfix 3.6.2
2021-07-28 01:11:11 +02:00
Domen Kožar 16b7e4900e
Merge pull request #131705 from Mindavi/cgit/cross
cgit: support cross-compilation
2021-07-27 21:57:36 +02:00
Sander van der Burg 9de184f9bc
Merge pull request #131593 from svanderburg/add-ecwolf
ecwolf: init at 1.3.3
2021-07-27 21:54:17 +02:00
Domen Kožar 5556be0351
Merge pull request #131702 from bbigras/cloudflared-pkg
cloudflared: 2021.7.0 -> 2021.7.2
2021-07-27 21:48:23 +02:00
Antoine Eiche 69a63587e0 postfix: add lewo as maintainer 2021-07-27 21:46:03 +02:00
Antoine Eiche 9df6e2b1cd postfix: 3.6.1 -> 3.6.2
The source url has also been updated to the "multiple
locations (Europe)" url published on the
http://www.postfix.org/download.html page.
2021-07-27 21:46:02 +02:00
Austin Seipp 59297dde88 yosys: 0.9+4052 -> 0.9+4221
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2021-07-27 14:27:30 -05:00
figsoda 6d118402f2 vimPlugins.goto-preview: init at 2021-06-20 2021-07-27 12:19:19 -07:00
figsoda b8d14783c2 vimPlugins: update 2021-07-27 12:19:19 -07:00
Michael Weiss 8e4203dd57
Merge pull request #131714 from primeos/chromiumDev
chromiumDev: 93.0.4577.8 -> 93.0.4577.15
2021-07-27 20:45:25 +02:00
Bruno Bigras 54fb628d7c cloudflared: 2021.7.0 -> 2021.7.3 2021-07-27 14:41:57 -04:00
Fabian Affolter 5d2d601899 python3Packages.nexia: 0.9.10 -> 0.9.11 2021-07-27 11:32:45 -07:00
Michael Weiss 68adc7b81c
chromiumDev: 93.0.4577.8 -> 93.0.4577.15 2021-07-27 20:23:16 +02:00
Fabian Affolter d71d1915bf python3Packages.matrix-client: 0.3.2 -> 0.4.0 2021-07-27 11:15:24 -07:00
Fabian Affolter 93b1ba9a94 electrum: override aiorpcx 2021-07-27 11:14:35 -07:00
Fabian Affolter 8560fdb907 python3Packages.aiorpcx: 0.18.7 -> 0.22.1 2021-07-27 11:14:35 -07:00
Michael Weiss a4beb3027c
Merge pull request #131711 from primeos/chromiumDev
chromiumDev: Fix the build
2021-07-27 20:13:17 +02:00
Michael Weiss bd22d2425c
chromiumDev: Fix the build
Our system FFmpeg version is too outdated and Snappy causes a linking
failure (I didn't have time to investigate yet). Hopefully we can revert
this before the stable release of M93.
2021-07-27 19:51:05 +02:00
Rick van Schijndel ec518eb21b cgit: support cross-compilation
asciidoc was in the incorrect location, and CC and AR must be set
explictly.
2021-07-27 19:11:55 +02:00
Guillaume Girol 407ef1dc6f
Merge pull request #121530 from symphorien/wifireg
nixos: add option to load wireless regulatory database as firmware
2021-07-27 16:43:57 +00:00
Fabian Affolter 9b3caf1d0c
Merge pull request #131671 from fabaff/bump-nuclei
nuclei: 2.4.0 -> 2.4.1
2021-07-27 18:41:05 +02:00
Ben Siraphob 2e5c4d5fe7
Merge pull request #131634 from ryanorendorff/functional-linear-algebra-0.4
agdaPackages.functional-linear-algebra 0.3->0.4
2021-07-27 23:18:14 +07:00
Ben Siraphob e2f517b541
Merge pull request #131680 from fabaff/bump-async-dns
python3Packages.async-dns: 1.1.10 -> 2.0.0
2021-07-27 23:17:40 +07:00
Ryan Orendorff 721475c83b agdaPackages.functional-linear-algebra 0.3->0.4 2021-07-27 10:14:32 -06:00
Fabian Affolter 053e4d104a python3Packages.async-dns: 1.1.10 -> 2.0.0 2021-07-27 17:59:41 +02:00
Ben Siraphob ec1551facf
Merge pull request #131696 from jonringer/fix-python-lz4
python3Packages.joblib: fix eval
2021-07-27 22:58:32 +07:00
Niklas Hambüchen b8ca8f8377
Merge pull request #128153 from nh2/manuals-linking-nixos-tests-to-packages
manuals: Describe how to link NixOS tests from packages
2021-07-27 17:53:29 +02:00
Fabian Affolter 6b63947021 python3Packages.pytile: 5.2.2 -> 5.2.3 2021-07-27 08:39:53 -07:00
Niklas Hambüchen fe5f3f65e2 manuals: Describe how to link NixOS tests from packages 2021-07-27 17:39:33 +02:00
Jonathan Ringer 9de6ec98c0
python3Packages.joblib: fix eval 2021-07-27 08:22:34 -07:00
Ben Siraphob 66e1f68792
Merge pull request #131659 from mweinelt/anyio
python3Packages.anyio: 3.2.1 -> 3.3.0
2021-07-27 22:21:36 +07:00
Sandro Jäckel 722ac674d2 python39Packages.buildbot: remove alias 2021-07-27 08:16:20 -07:00
Sandro Jäckel 6f99ce0c74 cinnamon-common: remove alias 2021-07-27 08:16:20 -07:00
Sandro Jäckel 2008472e41 python39Packages: remove two more aliases 2021-07-27 08:16:20 -07:00
Sandro Jäckel e10b6e7e3b whatsapp-for-linux: format, remove aliases 2021-07-27 08:14:56 -07:00
Sandro Jäckel 800a59684e sqlfluff: remove alias 2021-07-27 08:14:56 -07:00
Sandro Jäckel 96f904b076 python39Packages.python-mapnik: cleanup, remove pkgs from input, remove alias 2021-07-27 08:14:56 -07:00
Sandro Jäckel 4600fb8466 pgtop: remove alias 2021-07-27 08:14:56 -07:00
Sandro Jäckel 82bcc356c3 pcloud: remove alias 2021-07-27 08:14:56 -07:00
Sandro Jäckel b683f580c0 icecat-bin: remove alias 2021-07-27 08:14:56 -07:00
Sandro Jäckel d64d6fb45a dnsrecon: remove alias 2021-07-27 08:14:56 -07:00
Sandro Jäckel 332e711c66 eventlog: cleanup 2021-07-27 08:14:56 -07:00
Sandro Jäckel 562b876e2c citrix-workspace: remove alias 2021-07-27 08:14:56 -07:00
Fabian Affolter d8dc6eb52e python3Packages.amcrest: 1.7.2 -> 1.8.0 2021-07-27 08:13:20 -07:00
Ben Siraphob 52168faa5b
Merge pull request #131672 from sternenseemann/pecu-0.6
ocamlPackages.pecu: 0.5 -> 0.6
2021-07-27 21:45:55 +07:00
Ben Siraphob 712600db3b
Merge pull request #131606 from mweinelt/mysql
mysql80: 8.0.25 -> 8.0.26
2021-07-27 21:39:40 +07:00
Ben Siraphob 006b0b6a67
Merge pull request #131682 from Stunkymonkey/development-phases
development/tools: deprecate phases
2021-07-27 21:36:00 +07:00
Ben Siraphob 21889a973b
Merge pull request #131628 from r-ryantm/auto-update/deno
deno: 1.12.1 -> 1.12.2
2021-07-27 21:35:34 +07:00
Ben Siraphob bbb6ecf0e6
Merge pull request #131613 from fabaff/bump-aiowinreg
python3Packages.aiowinreg: 0.0.5 -> 0.0.6
2021-07-27 21:34:28 +07:00