Commit graph

301376 commits

Author SHA1 Message Date
Maximilian Bosch
e14c245934
flake/lib.nixosSystem: add _file-keys for error-location
When inlining a module with a problematic declaration, you usually get
get a not-so helpful error like this:

    $ cat flake.nix
    {
      description = "A very basic flake";
      inputs.nixpkgs.url = path:../.;
      outputs = { self, nixpkgs }: {
        nixosConfigurations.foo = nixpkgs.lib.nixosSystem {
          system = "x86_64-linux";
          modules = [
            ({ lib, ... }: { services.wrong = 2; })
            { services.nginx.enable = true; }
          ];
        };
      };
    }
    $ nixos-rebuild build --flake .#foo -L
    error: The option `services.wrong' does not exist. Definition values:
           - In `<unknown-file>': 2

While it's certainly possible to guess where this comes from, this is
IMHO fairly confusing for beginners (and kinda reminds me of the
infamous "infinite recursion at undefined position"-error).

The module-system determines the position of a declaration using the
`_file`-key: this is either `toString path` if `path` is e.g. a value
from `imports = [ ./foo.nix ]` or the file used as `NIXOS_CONFIG` in
`<nixpkgs/nixos>`.

However such a mechanism doesn't exist (yet) for inlined flake modules,
so I tried to implement this in a fairly basic way:

* For non-path declarations, the position of `modules` inside the
  `flake.nix` which declares these modules is determined by doing
  `unsafeGetAttrPos` on the `modules`-argument of `lib.nixosSystem`.

  So the `flake.nix` from above would now raise the following
  error-message:

        $ nixos-rebuild build --flake .#foo -L
        error: The option `services.wrong' does not exist. Definition values:
               - In `/nix/store/4vi3nhqjyma73ygs4f93q38qjkhkaxw8-source/flake.nix': 2

Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
Co-authored-by: Silvan Mosberger <github@infinisil.com>
Co-authored-by: Robert Hensing <robert@roberthensing.nl>
2021-07-14 10:12:57 +02:00
Maximilian Bosch
aa1561e780
Merge pull request #129712 from lf-/update-nix-doc
nix-doc: 0.5.0 -> 0.5.1
2021-07-09 21:01:50 +02:00
Jade
760e7e14b3 nix-doc: Fix lint: the license is LGPL3+ 2021-07-09 11:17:55 -07:00
Robert Hensing
8da27ef161
Merge pull request #129696 from rycee/make-nixos-option-a-proper-package
nixos-option: init at <unversioned>
2021-07-09 19:54:23 +02:00
Sandro
df0d321258
Merge pull request #123765 from hyperfekt/update-bcachefs 2021-07-09 16:30:43 +02:00
Raphael Megzari
84eb0781aa
lemmy: init 0.11.2 (#129723)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-09 16:28:08 +02:00
Sandro
89d0555568
Merge pull request #129169 from fabaff/over-gitlint
gitlint: override requirements
2021-07-09 14:44:30 +02:00
Sandro
01c064e98c
Merge pull request #129747 from 06kellyjac/kube3d
kube3d: 4.4.6 -> 4.4.7
2021-07-09 14:44:05 +02:00
Maximilian Bosch
32b9c9a189
EmptyEpsilon: 2021.03.31 -> 2021.06.23 (#129739)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-09 14:42:43 +02:00
Sandro
9c6e9a8a5a
Merge pull request #129664 from sheepforce/engauge-digitizer
engauge-digitizer: init at 12.1
2021-07-09 14:41:27 +02:00
Sandro
5cff193650
Merge pull request #129750 from fabaff/bump-pyfronius
python3Packages.pyfronius: 0.5.2 -> 0.5.3
2021-07-09 14:40:48 +02:00
Sandro
35092090bf
Merge pull request #128632 from ivan-tkatchev/airflow 2021-07-09 14:36:13 +02:00
Ben Siraphob
3191d4f0af
Merge pull request #129661 from peperunas/master
mysql: 8.0.22 -> 8.0.25
2021-07-09 19:18:00 +07:00
Ben Siraphob
3bca92a4b8
Merge pull request #129740 from r-ryantm/auto-update/imgproxy
imgproxy: 2.16.5 -> 2.16.6
2021-07-09 19:17:33 +07:00
Ben Siraphob
750ab7cb09
Merge pull request #129329 from centromere/zcash-4.4.1
zcash: 4.4.0 -> 4.4.1
2021-07-09 19:16:33 +07:00
Ulrik Strid
ed4cbb7b59 ocamlPackages.uecc: init at 0.3 2021-07-09 14:15:49 +02:00
Ben Siraphob
0edad6de4b
Merge pull request #129701 from cole-h/zrepl
zrepl: wrap with ssh in PATH
2021-07-09 19:08:56 +07:00
Alyssa Ross
c85f77790b squeekboard: 1.13.0 -> 1.14.0 2021-07-09 11:46:25 +00:00
Fabian Affolter
c70e4a6089 python3Packages.pyfronius: 0.5.2 -> 0.5.3 2021-07-09 13:46:15 +02:00
R. RyanTM
3e75e57eb4
elfkickers: 3.1a -> 3.2 (#124178)
Co-authored-by: Will Dietz <w@wdtz.org>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-09 13:33:57 +02:00
Sandro
c160074a23
Merge pull request #129692 from figsoda/fcp 2021-07-09 13:33:38 +02:00
Phillip Seeber
5c4d869ada engauge-digitizer: init at 12.1
code-review hints


engauge-digitizer: code review suggestions
2021-07-09 13:27:30 +02:00
06kellyjac
021bc5b929 kube3d: 4.4.6 -> 4.4.7 2021-07-09 12:02:50 +01:00
Sandro
d90db7b8de
Merge pull request #129688 from fabaff/bump-tinydb
python3Packages.tinydb: 4.4.0 -> 4.5.0
2021-07-09 12:48:35 +02:00
Fabian Affolter
256993cc59 gitlint: override requirements 2021-07-09 12:46:49 +02:00
Sandro
0efd839c9b
Merge pull request #129708 from IvarWithoutBones/init/mc-tools 2021-07-09 12:46:22 +02:00
Sandro
263fa831a1
Merge pull request #129699 from TredwellGit/linux 2021-07-09 12:45:00 +02:00
Sandro
b89c5e9346
Merge pull request #129743 from fabaff/bump-metasploit
metasploit: 6.0.51 -> 6.0.52
2021-07-09 12:43:58 +02:00
Sandro
87af92267a
Merge pull request #129694 from helsinki-systems/upd/nginx
nginxMainline: 1.21.0 -> 1.21.1
2021-07-09 12:43:37 +02:00
Sandro
4fc14f196b
Merge pull request #129704 from cjab/vimplugins-dadbod-ui
vimPlugins.vim-dadbod-ui: init at 2021-05-12
2021-07-09 12:41:52 +02:00
Sandro
3c5f5c1171
Merge pull request #129635 from fabaff/bump-requests-cache 2021-07-09 12:39:48 +02:00
Sandro
5dbe52bf0c
Merge pull request #129668 from talyz/terser 2021-07-09 12:20:43 +02:00
Maciej Krüger
e4e05cd813
Merge pull request #129693 from helsinki-systems/upd/nginxQuic 2021-07-09 12:20:06 +02:00
Fabian Affolter
fb93340613 metasploit: 6.0.51 -> 6.0.52 2021-07-09 12:17:16 +02:00
Sandro
f698696403
Merge pull request #129731 from fabaff/bump-exploitdb
exploitdb: 2021-07-06 -> 2021-07-09
2021-07-09 12:11:11 +02:00
Michael Weiss
a5bcde152c
Merge pull request #129738 from primeos/nixos-tests-chromium
nixos/tests/chromium: Fix the test for M92+
2021-07-09 11:48:24 +02:00
R. RyanTM
7d766fb478 imgproxy: 2.16.5 -> 2.16.6 2021-07-09 09:47:41 +00:00
Michael Weiss
f9645002a2
nixos/tests/chromium: Fix the test for M92+
Unfortunately there are some regressions in the GPU code that cause
Chromium and Google Chrome to crash, e.g.:
machine # [0709/084047.890436:ERROR:process_memory_range.cc(75)] read out of range[   30.153484] show_signal: 20 callbacks suppressed
machine # [   30.153490] traps: chrome[1036] trap invalid opcode ip:55af03357b29 sp:7ffeaa69ad10 error:0 in chrome[55aefe7a4000+81ec000]
machine #
machine # [0709/084047.955039:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq: No such file or directory (2)
machine # [0709/084047.955078:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq: No such file or directory (2)
machine # [   30.126905] systemd[1]: Created slice system-systemd\x2dcoredump.slice.
machine # [   30.137012] systemd[1]: Started Process Core Dump (PID 1038/UID 0).
machine # [   30.571987] systemd-coredump[1039]: Process 1036 (chrome) of user 1000 dumped core.
machine # [992:1021:0709/084048.501937:ERROR:gpu_process_host.cc(995)] GPU process exited unexpectedly: exit_code=132
machine # [   30.594747] systemd[1]: systemd-coredump@0-1038-0.service: Succeeded.

Hopefully this'll be fixed upstream before the final release (there are
bug reports for it) but for the meantime we have to launch the beta and
dev versions with "--use-gl=angle --use-angle=swiftshader".
2021-07-09 11:30:04 +02:00
Sandro
46bdc9017c
Merge pull request #129691 from fabaff/bump-nexia 2021-07-09 11:22:43 +02:00
Sandro
4c7d35fdf4
Merge pull request #129682 from r-ryantm/auto-update/insomnia
insomnia: 2021.4.0 -> 2021.4.1
2021-07-09 11:19:16 +02:00
markuskowa
3f92843767
Merge pull request #129663 from sheepforce/dkh
dkh: init at 1.2
2021-07-09 11:09:17 +02:00
Ivan Tkachev
2fee354ae4 python3Packages.cattrs: disable for python older than 3.7 2021-07-09 11:53:05 +03:00
Ivan Tkachev
d7b66a7a01 python3Packages.apache-airflow: 1.10.5 -> 2.1.1 2021-07-09 11:51:31 +03:00
Ivan Tkachev
a3510b8eb6 python3Packages.flask-appbuilder: 3.3.0 -> 3.3.1 2021-07-09 11:51:31 +03:00
Ivan Tkachev
e6a4acc6ad python3Packages.marshmallow-oneofschema: init at 2.1.0 2021-07-09 11:51:31 +03:00
Ivan Tkachev
f6d7ad53c4 python3Packages.python-nvd3: init at 0.15.0 2021-07-09 11:51:31 +03:00
Ivan Tkachev
f41d6886ee python3Packages.sqlalchemy-jsonfield: init at 1.0.0 2021-07-09 11:51:31 +03:00
Jörg Thalheim
f29159e2e8
Merge pull request #129649 from em0lar/telegraf-1.19.1
telegraf: 1.18.1 -> 1.19.1
2021-07-09 09:47:15 +01:00
Sandro
43b68c4bca dkh: init at 1.2
Apply suggestions from code review
2021-07-09 10:40:51 +02:00
Michael Weiss
a99ecbd5f5
Merge pull request #129727 from primeos/chromiumBeta
chromiumBeta: 92.0.4515.80 -> 92.0.4515.93
2021-07-09 10:38:52 +02:00