Commit Graph

145457 Commits

Author SHA1 Message Date
Maximilian Bosch
6f72b63601
nixos/nixos-option: don't abort in case of evaluation errors
When running e.g. `nixos-option boot.kernelPackages` I get an output
like this on the current unstable channel (18.09pre144959.be1461fc0ab):

```
$ nixos-option boot.kernelPackages
Value:
*exit 1*
```

This is fairly counter-intuitive as I have no clue what might went
wrong. `strace` delivers an output like this:

```
read(3, "error: Package \342\200\230cryptodev-linu"..., 128) = 128
read(3, "ux/cryptodev/default.nix:22 is m"..., 128) = 128
read(3, "lowBroken = true; }\nin configura"..., 128) = 128
read(3, "you can add\n  { allowBroken = tr"..., 128) = 128
read(3, "n)\n", 128)                    = 3
read(3, "", 128)                        = 0
```

`nixos-option` evaluates the system config using `nix-instantiate` which
might break when the evaluation fails (e.g. due to broken or unfree
packages that are prohibited to evaluate by default). The script aborts
due to the shebang `@shell@ -e`.

In order to ensure that no unexpected
behavior occurs due to removing `-e` from the interpreter the easiest
way to work around this was to wrap `nix-instantiate` in `evalNix()`
with a `set +e`. The function checks the success of the evaluation with
`$?` in the end. Additionally `evalNix` shouldn't break, if one
evaluation (e.g. the values that contain a package set by default) to
return additional information like a description.

With the change `nixos-option boot.kernelPackages` delivers the
following output for me:

```
Value:
error: Package ‘cryptodev-linux-1.9-4.14.52’ in /nix/store/47z2s8cwppymmgzw6n7pbcashikyk5jk-nixos/nixos/pkgs/os-specific/linux/cryptodev/default.nix:22 is marked as broken, refusing to evaluate.

Default:
{ __unfix__ = <LAMBDA>; acpi_call = <CODE>; amdgpu-pro = <CODE>; ati_drivers_x11 = <CODE>; batman_adv = <CODE>; bbswitch = <CODE>; bcc = <CODE>; beegfs-module = <CODE>; blcr = <CODE>; broadcom_sta = <CODE>; callPackage = <CODE>; cpupower = <CODE>; cryptodev = <CODE>; dpdk = <CODE>; e1000e = <CODE>; ena = <CODE>; evdi = <CODE>; exfat-nofuse = <CODE>; extend = <CODE>; facetimehd = <CODE>; fusionio-vsl = <CODE>; hyperv-daemons = <CODE>; ixgbevf = <CODE>; jool = <CODE>; kernel = <CODE>; lttng-modules = <CODE>; mba6x_bl = <CODE>; mwprocapture = <CODE>; mxu11x0 = <CODE>; ndiswrapper = <CODE>; netatop = <CODE>; nvidiaPackages = <CODE>; nvidia_x11 = <CODE>; nvidia_x11_beta = <CODE>; nvidia_x11_legacy304 = <CODE>; nvidia_x11_legacy340 = <CODE>; nvidiabl = <CODE>; odp-dpdk = <CODE>; openafs = <CODE>; openafs_1_8 = <CODE>; perf = <CODE>; phc-intel = <CODE>; pktgen = <CODE>; ply = <CODE>; prl-tools = <CODE>; recurseForDerivations = true; rtl8192eu = <CODE>; rtl8723bs = <CODE>; rtl8812au = <CODE>; rtl8814au = <CODE>; rtlwifi_new = <CODE>; sch_cake = <CODE>; spl = <CODE>; splLegacyCrypto = <CODE>; splStable = <CODE>; splUnstable = <CODE>; stdenv = <CODE>; sysdig = <CODE>; systemtap = <CODE>; tbs = <CODE>; tmon = <CODE>; tp_smapi = <CODE>; usbip = <CODE>; v4l2loopback = <CODE>; v86d = <CODE>; vhba = <CODE>; virtualbox = <CODE>; virtualboxGuestAdditions = <CODE>; wireguard = <CODE>; x86_energy_perf_policy = <CODE>; zfs = <CODE>; zfsLegacyCrypto = <CODE>; zfsStable = <CODE>; zfsUnstable = <CODE>; }

Example:
{ _type = "literalExample"; text = "pkgs.linuxPackages_2_6_25"; }

Description:

"This option allows you to override the Linux kernel used by\nNixOS. Since things like external kernel module packages are\ntied to the kernel you're using, it also overrides those.\nThis option is a function that takes Nixpkgs as an argument\n(as a convenience), and returns an attribute set containing at\nthe very least an attribute <varname>kernel</varname>.\nAdditional attributes may be needed depending on your\nconfiguration. For instance, if you use the NVIDIA X driver,\nthen it also needs to contain an attribute\n<varname>nvidia_x11</varname>.\n"

Declared by:
  "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/kernel.nix"

Defined by:
  "/home/ma27/Projects/nixos-config/system/boot.nix"
```
2018-07-12 00:37:01 +02:00
Graham Christensen
96305ca6f2
Merge pull request #43094 from grahamc/fix-quagga-docs
quagga module: Use a deep merge via imports instead of the shallow merge
2018-07-06 17:47:05 -04:00
Timo Kaufmann
ddc7051552 pythonPackages.flask-autoindex: 2018-06-28 -> 0.6.1 (#43126) 2018-07-06 22:47:40 +02:00
Graham Christensen
a8978f9b93
Merge pull request #43125 from grahamc/fix-network-lo-alias
networking: Fix timeout when `lo` has aliased IPs
2018-07-06 16:10:58 -04:00
leenaars
5902e11cd6 termtekst: init -> 1.0 (#43045) 2018-07-06 21:55:18 +02:00
Graham Christensen
48d292e8a1
networking: Fix timeout when lo has aliased IPs
With a config like

    {
      networking.interfaces."lo".ip4 = [
        { address = "10.8.8.8"; prefixLength = 32; }
      ];
    }

a nixos-rebuild switch would take a long time, and you'd see:

    $ systemctl list-jobs
       JOB UNIT                                TYPE  STATE
    734400 network-interfaces.target           start waiting
    734450 sys-subsystem-net-devices-lo.device start running
    734449 network-link-lo.service             start waiting

and:

    systemd[1]: sys-subsystem-net-devices-lo.device: Job sys-subsystem-net-devices-lo.device/star>
    systemd[1]: sys-subsystem-net-devices-lo.device: Job sys-subsystem-net-devices-lo.device/star>
    systemd[1]: Timed out waiting for device sys-subsystem-net-devices-lo.device.

This removes the device dependency for `lo` and fixes this bug.

Closes #7227
2018-07-06 15:38:52 -04:00
Demyan Rogozhin
29021eab6a particl-core: 0.16.0.5 -> 0.16.1.0 (#43114) 2018-07-06 21:25:46 +02:00
R. RyanTM
be9c58b997 edbrowse: 3.7.3 -> 3.7.4 (#43037)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/edbrowse/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/7jcarzh31rmwvwsahbhq2k74al2x2am2-edbrowse-3.7.4/bin/edbrowse had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.7.4 with grep in /nix/store/7jcarzh31rmwvwsahbhq2k74al2x2am2-edbrowse-3.7.4
- directory tree listing: https://gist.github.com/21b2adbe415a5e475da47207b1f79386
- du listing: https://gist.github.com/e6ec448b581313e4148fb251bcdca067
2018-07-06 21:08:11 +02:00
Jude Taylor
6084eacc66 remove redundant patch from GHC 8.6.1 for darwin 2018-07-06 12:00:09 -07:00
R. RyanTM
6519ea5671 riemann_c_client: 1.10.1 -> 1.10.2 (#42961)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/riemann-c-client/versions.

These checks were done:

- built on NixOS
- /nix/store/hxh4dj91473d8wlyr2kaqf5n6hcn8z4b-riemann-c-client-1.10.2/bin/riemann-client passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.10.2 with grep in /nix/store/hxh4dj91473d8wlyr2kaqf5n6hcn8z4b-riemann-c-client-1.10.2
- directory tree listing: https://gist.github.com/64c27a461ed26c33098195c79327e87c
- du listing: https://gist.github.com/7bdbbd558a2ce067e9e413f0bbba1185
2018-07-06 20:51:40 +02:00
R. RyanTM
499ccb69e7 passExtensions.pass-otp: 1.1.0 -> 1.1.1 (#42973)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pass-otp/versions.

Version release notes (from GitHub):

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.1.1 with grep in /nix/store/qam419864q7zv1fllmjpsylw6c0b76y6-pass-otp-1.1.1
- directory tree listing: https://gist.github.com/7a35773fe3bff95a565cc4f539706da6
- du listing: https://gist.github.com/adf137d812986c88efa0c217189d79a3
2018-07-06 20:43:45 +02:00
R. RyanTM
cb85999b6b picard-tools: 2.18.7 -> 2.18.9 (#42967)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/picard-tools/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/ah3v1x61gmj9lan8a3qvy3824lqvjdgi-picard-tools-2.18.9/bin/picard had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.18.9 with grep in /nix/store/ah3v1x61gmj9lan8a3qvy3824lqvjdgi-picard-tools-2.18.9
- directory tree listing: https://gist.github.com/0972acdc51fe8a1cde470e4ab5e87993
- du listing: https://gist.github.com/6a66b6723ce4887cd108678369b87360
2018-07-06 20:24:57 +02:00
R. RyanTM
6d08204090 mate.pluma: 1.21.0 -> 1.21.1 (#42966)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pluma/versions.

These checks were done:

- built on NixOS
- /nix/store/qv4p1mlbwak5d9yrpx9asi95nyjqfcss-pluma-1.21.1/bin/pluma passed the binary check.
- /nix/store/qv4p1mlbwak5d9yrpx9asi95nyjqfcss-pluma-1.21.1/bin/.pluma-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 1.21.1 with grep in /nix/store/qv4p1mlbwak5d9yrpx9asi95nyjqfcss-pluma-1.21.1
- directory tree listing: https://gist.github.com/f06bd46e4278731e8bf069a5bc4f0f62
- du listing: https://gist.github.com/2e4b1ada7a39f4bb5b224c773d0096c6
2018-07-06 20:21:53 +02:00
R. RyanTM
a58efac160 libodfgen: 0.1.6 -> 0.1.7 (#42246)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libodfgen/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 0.1.7 with grep in /nix/store/9ngbm7b2sd2zvagliqnlgvx892ay7wm9-libodfgen-0.1.7
- directory tree listing: https://gist.github.com/6a8d890d4d5134b3b823c052014dfbd6
- du listing: https://gist.github.com/294321ff72a9aa97f89b6941ab62412d
2018-07-06 20:19:42 +02:00
R. RyanTM
593bb456e4 adapta-gtk-theme: 3.93.1.22 -> 3.93.1.28 (#43056)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions.

Version release notes (from GitHub):
* Added some workarounds for Pixel-saver applet in Budgie (Gtk+ 3.2x/4.0).
* Dropped some outdated styling in FirefoxQuantum (Gtk+ 3.2x/4.0).

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/2a01274ab6cfba1470a7eec4fd70802c
- du listing: https://gist.github.com/9c89b76ba6d49d6056387e6e044f346f
2018-07-06 20:16:29 +02:00
R. RyanTM
857f0753d6 riot-web: 0.15.5 -> 0.15.6 (#42958)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/riot-web/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 0.15.6 with grep in /nix/store/0gr8hg3lgymk3idlxb9i4q0p6yyq3azz-riot-web-0.15.6
- directory tree listing: https://gist.github.com/5d5d991112bb6e9960e1319112c7c6e9
- du listing: https://gist.github.com/e2ade24d81e7c7b978e65607f2d7b669
2018-07-06 20:12:27 +02:00
xeji
3035cd220e
Merge pull request #43084 from vbgl/ocaml-janestreet-0.11.0
ocamlPackages.janeStreet: 0.10 -> 0.11
2018-07-06 20:00:38 +02:00
Robert Schütz
7a59be9c52 maintainers/scripts/update-python-libraries: compare versions semantically instead of lexicographically (#43120) 2018-07-06 19:32:40 +02:00
averelld
06c6ff2465 mattermost-desktop: 4.1.1 -> 4.1.2 (#43117)
Also update some dependencies
2018-07-06 19:27:11 +02:00
Jaka Hudoklin
42f1372c53 telepresence: 0.67 -> 0.85 (#43116) 2018-07-06 19:23:43 +02:00
Matthew Bauer
fec309aee4 .dir-locals.el: init
This adds some initial values for .dir-locals.el. Mainly this is
useful for using bug-reference-mode.

So if you have bug-reference-mode enabled -

> M-x bug-reference-mode

You will see as clickable text like this:

  Fixes #15

  (#12)

  Closed #1252

  issue #1
2018-07-06 12:48:43 -04:00
Will Dietz
7835d7c74f
Merge pull request #43076 from dtzWill/update/kitty-0.11.2
kitty: 0.10.1 -> 0.11.2
2018-07-06 11:32:02 -05:00
Silvan Mosberger
140f384ff7
Merge pull request #43059 from r-ryantm/auto-update/armadillo
armadillo: 8.500.1 -> 8.600.0
2018-07-06 18:27:42 +02:00
Jan Tojnar
188e487dd1
gnome3: simplify package set using makeScope 2018-07-06 18:20:06 +02:00
Silvan Mosberger
8f5b0686ee
Merge pull request #43054 from r-ryantm/auto-update/chirp-daily
chirp: 20180614 -> 20180623
2018-07-06 18:14:44 +02:00
Peter Hoeg
9a066a3caf pythonPackages.matrix-client: 0.2.0 -> 0.3.2 (#42915) 2018-07-06 18:05:19 +02:00
Robert Schütz
871447a12e flexget: update propagatedBuildInputs 2018-07-06 17:54:39 +02:00
Graham Christensen
4a8793641d
Merge pull request #43121 from worldofpeace/patch-3
nixpkgs docs: correct misspell
2018-07-06 11:53:25 -04:00
lewo
2b5d151471
Merge pull request #43119 from nlewo/pr-fix-docker-tools-tests
dockerTools.examples: explicitly set image tag to fix docker-tools tests
2018-07-06 17:52:29 +02:00
worldofpeace
3662ca7500
nixpkgs docs: correct misspell 2018-07-06 15:52:19 +00:00
Robert Schütz
a49ac62722
Merge pull request #43106 from dotlambda/seafile-client-6.2.1
seafile-client: 6.1.8 -> 6.2.1
2018-07-06 17:47:08 +02:00
Matthew Bauer
6df7a8b34c dunst: fix building without dunstify
Fixes https://hydra.nixos.org/build/77046987/
2018-07-06 11:12:16 -04:00
Robert Schütz
1804301446 python: alembic: 0.9.9 -> 0.9.10 2018-07-06 17:09:24 +02:00
Antoine Eiche
d44b778d10 dockerTools.examples: explicitly set image tag to fix docker-tools tests
docker-tools tests load images without specifying any tag
value. Docker then uses the image with tag "latest" which doesn't
exist anymore since commit 39e678e24e.
2018-07-06 16:38:42 +02:00
Robert Schütz
fda46a645c python.pkgs.agate: fix tests
Need to use fetchFromGitHub because examples/ is missing from PyPI tarball.
Also clean up the expression and specify appropriate checkInputs.
Fixes #42867.
2018-07-06 16:22:51 +02:00
Robert Schütz
4b373bc3d9 seafile-client: 6.1.8 -> 6.2.1 2018-07-06 16:01:55 +02:00
Robert Schütz
376b222fd7 seafile-shared: 6.1.0 -> 6.2.1 2018-07-06 16:01:49 +02:00
Vladimír Čunát
38bca8d36f
nixos.tests.containers-imperative: increase VM memory
Apparently merging #43021 1bdb138710 did increase memory usage
in some cases.  1 GiB for a VM memory seems still low enough to me.
2018-07-06 15:57:57 +02:00
Mathias Schreck
39e678e24e dockerTools.buildImage: add option to use nix output hash as tag 2018-07-06 15:15:09 +02:00
Jaka Hudoklin
588dbd714e apache-kafka: add missing gnugrep gnused and coreutils deps (#43111) 2018-07-06 14:18:42 +02:00
Maximilian Bosch
e331236d57 termtosvg: init at 0.3.0 (#43069)
`termtosvg` makes screencasts and writes them into a SVG file. The app
can be used on CLI entirely.

Closes #42921
2018-07-06 14:11:50 +02:00
Vladimír Čunát
ec199f0941
Merge #43021: nix: use boehmgc with enableLargeConfig 2018-07-06 13:46:40 +02:00
xeji
d868a26a51
Merge pull request #43100 from qoelet/gnu-pw-mgr
gnu-pw-mgr: init 2.3.2
2018-07-06 13:42:58 +02:00
Vladimír Čunát
1bdb138710
nix: use boehmgc with enableLargeConfig = true
Fixes #43015 for me and hopefully also similar issues.

== Resource consumption ==

TL;DR: no change for small-memory cases, less CPU for large-memory cases.

I assume almost all of the large memory usage is just the expression
evaluation and managed by the GC, so I used just `nix-env -q...` to test.
Old and new lines for each command follow.  I tried to run each several
times, but the values were very stable (<1% difference on re-runs),
so only one line for each command-version pair is provided.

$ time nix-env -f . -qaP --description -A nix >/dev/null
- 0.06user 0.01system 0:00.07elapsed 101%CPU (0avgtext+0avgdata 29036maxresident)k
+ 0.06user 0.01system 0:00.07elapsed 102%CPU (0avgtext+0avgdata 29864maxresident)k

$ time nix-env -f . -qaP --description >/dev/null
- 6.45user 0.36system 0:06.82elapsed  99%CPU (0avgtext+0avgdata 1021024maxresident)k
+ 6.23user 0.33system 0:06.57elapsed 100%CPU (0avgtext+0avgdata  938408maxresident)k

$ time nix-env -f . --show-trace -qa --drv-path --system --meta --xml 2>&1 >/dev/null
- 56.35user 0.96system 0:31.03elapsed 184%CPU (0avgtext+0avgdata 3207708maxresident)k
+ 44.80user 0.91system 0:26.12elapsed 175%CPU (0avgtext+0avgdata 3192696maxresident)k

$ time ./result-nix-large/bin/nix-instantiate --dry-run --eval --strict \
    --show-trace ./maintainers/scripts/eval-release.nix > /dev/null
- Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS
- Command terminated by signal 6
- 175.18user 2.68system 1:17.42elapsed 229%CPU (0avgtext+0avgdata 8468440maxresident)k
+ 178.48user 2.78system 1:15.11elapsed 241%CPU (0avgtext+0avgdata 8460572maxresident)k
2018-07-06 13:03:45 +02:00
Kenny Shen
e921aa02b1 gnu-pw-mgr: init 2.3.2 2018-07-06 19:00:57 +08:00
Vincent Demeester
77153c4cdb gauge: 0.9.7 -> 1.0.0 (#43107)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-06 12:49:06 +02:00
André-Patrick Bubel
34a8ebc7b1 slic3r-prusa3d: 1.40.0 -> 1.40.1 (#43102) 2018-07-06 12:25:58 +02:00
Michael Fellinger
08e79cad4f Mint: 0.0.4 -> 0.1.0 (#43103) 2018-07-06 11:32:08 +02:00
Will Dietz
f22cbe5c35 xbacklight: 1.2.1 -> 1.2.2 (#43101) 2018-07-06 11:27:49 +02:00
xeji
5ea2eb7ac9
Merge pull request #43090 from flokli/gocryptfs-1.5
gocryptfs: 1.1.1 -> 1.5
2018-07-06 11:26:33 +02:00