Commit graph

153862 commits

Author SHA1 Message Date
aszlig
9bfd864c59
Merge reording asserts in NixOS eval (#47293)
Changes the evaluation order in that it evaluates assertions before
warnings, so that eg. the following would work:

  { config, lib, ... }:

  {
    options.foo = lib.mkOption {
      type = lib.types.bool;
      default = true;
      description = "...";
    };

    options.bar = lib.mkOption {
      type = lib.types.bool;
      default = false;
      description = "...";
    };

    config = lib.mkMerge [
      (lib.mkIf config.bar {
        system.build.bar = "foobar";
      })
      (lib.mkIf config.foo {
        assertions = lib.singleton {
          assertion = config.bar;
          message = "Bar needs to be enabled";
        };
        systemd.services.foo = {
          description = "Foo";
          serviceConfig.ExecStart = config.system.build.bar;
        };
      })
    ];
  }

This is because the systemd module includes definitions for warnings
that would trigger evaluation of the config.system.build.bar definition.

The original pull request references a breakage due to the following:

  {
    services.nixosManual.enable = false;
    services.nixosManual.showManual = true;
  }

However, changing the eval order between asserts and warnings clearly is
a corner case here and it only happens because of the aforementioned
usage of warnings in the systemd module and needs more discussion.

Nevertheless, this is still useful because it lowers the evaluation time
whenever an assertion is hit, which is a hard failure anyway.
2018-09-26 01:18:41 +02:00
xeji
14a1907afa
Merge pull request #47358 from volth/perl-dev
perl: add devel version at 5.29.3
2018-09-26 00:20:07 +02:00
Jörg Thalheim
0f433efe3a
Merge pull request #47322 from r-ryantm/auto-update/ace
ace: 6.5.1 -> 6.5.2
2018-09-25 23:11:37 +01:00
Jörg Thalheim
9e17f34da9
Merge pull request #47343 from dywedir/cargo-edit
cargo-edit: 0.3.0 -> 0.3.1
2018-09-25 23:11:19 +01:00
Jörg Thalheim
3833381dc9
Merge pull request #47319 from r-ryantm/auto-update/cadvisor
cadvisor: 0.30.2 -> 0.31.0
2018-09-25 23:02:44 +01:00
Jörg Thalheim
342f52800f
Merge pull request #47333 from r-ryantm/auto-update/alembic
alembic: 1.7.8 -> 1.7.9
2018-09-25 22:54:34 +01:00
Jörg Thalheim
fba2cbaf0a
Merge pull request #47337 from r-ryantm/auto-update/apktool
apktool: 2.3.3 -> 2.3.4
2018-09-25 22:45:38 +01:00
Jörg Thalheim
7c233cec48
Merge pull request #47336 from r-ryantm/auto-update/brightnessctl
brightnessctl: 0.3.2 -> 0.4
2018-09-25 22:44:39 +01:00
Jörg Thalheim
7fc35122aa
Merge pull request #47338 from r-ryantm/auto-update/cb2bib
cb2bib: 1.9.8 -> 1.9.9
2018-09-25 22:43:20 +01:00
Jörg Thalheim
9d7868d70b
Merge pull request #47341 from r-ryantm/auto-update/batctl
batctl: 2018.2 -> 2018.3
2018-09-25 22:42:16 +01:00
aszlig
c5bb43188d
nixos: Fix eval error for documentation.nixos
Introduced by 0f3b89bbed.

If services.nixosManual.showManual is enabled and
documentation.nixos.enable is not, there is no
config.system.build.manual available, so evaluation fails. For example
this is the case for the installer tests.

There is however an assertion which should catch exactly this, but it
isn't thrown because the usage of config.system.build.manual is
evaluated earlier than the assertions.

So I split the assertion off into a separate mkIf to make sure it is
shown appropriately and also fixed the installation-device profile to
enable documentation.nixos.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @oxij
2018-09-25 23:39:44 +02:00
Jörg Thalheim
6cd90cb0e1
Merge pull request #47368 from Mic92/vim-husk
vimPlugins.vim-husk: init at 2015-11-29
2018-09-25 22:29:55 +01:00
Jean-Philippe Cugnet
6e5682ab41
erlangR20: 20.3.8 -> 20.3.8.9 2018-09-25 23:21:06 +02:00
Jörg Thalheim
b7d34a3d13 vimPlugins.vim-husk: init at 2015-11-29
(cherry picked from commit ef32704f1d537512842ea711881f333413f08b79)
2018-09-25 22:15:32 +01:00
Jörg Thalheim
3b4a8a6902 vimPlugins: update
(cherry picked from commit f1477a3c87020ce5262ffa3cf78fa38e22dca6c2)
2018-09-25 22:15:24 +01:00
aszlig
65d0b082f3
Merge Paperwork update to version 1.2.4 (#46487)
Thanks to @symphorien for this work, which apart from the update itself
includes a few more fixes and cleanups.

I've tested building and running the upgraded Paperwork and while I
haven't done extensive testing on every little feature it seems to work
so far.

The changes also include an addition to fetchFromGitLab, which allows to
specify a group.

Merges: #46487
2018-09-25 23:13:08 +02:00
volth
b7ac8824af
perldevel: use double quote to preserve ''\.'' 2018-09-25 20:52:31 +00:00
Jean-Philippe Cugnet
bf22712993
erlangR19: 19.3.6.6 -> 19.3.6.11 2018-09-25 22:39:54 +02:00
Daiderd Jordan
9b99819283
freedroidrpg: don't build on hydra
Similar to some other builds, sdl-config gets stuck and times out.

    checking for sdl-config... /nix/store/q2hm1ka0qxs2gv5bmrxj7j80lygk4b5z-SDL-1.2.15-dev/bin/sdl-config
    building of '/nix/store/m2d7v0n5hd2498vfxp18i37p7r1lf76p-freedroidrpg-0.16.1' timed out after 7200 seconds of silence

/cc ZHF #45961
2018-09-25 22:34:30 +02:00
xeji
4ad424fbd6
qboot: 20150603 -> 20170330, fix build (#47364)
Switch back to original upstream project which is more recent
than the fork we used.
2018-09-25 22:32:46 +02:00
Daiderd Jordan
cd78d0cc3f
flpsed: mark linux only
Doesn't build on darwin and probably other platforms.

    GsWidget.H:26:3: error: 'Atom' does not name a type; did you mean 'tm'?
       Atom atoms[5];
       ^~~~
       tm
    GsWidget.cxx: In member function 'void GsWidget::setProps()':
    GsWidget.cxx:47:2: error: 'atoms' was not declared in this scope
      atoms[0] = XInternAtom(fl_display,"GHOSTVIEW" , false);
      ^~~~~

/cc ZHF #45961
2018-09-25 22:31:20 +02:00
Daiderd Jordan
6390b8b63e
fox: mark broken on darwin
Undefined symbols for architecture x86_64:
      "_MPCreateSemaphore", referenced from:
          FX::FXSemaphore::FXSemaphore(int) in FXThread.o
          FX::FXSemaphore::FXSemaphore(int) in FXThread.o
      "_MPDeleteSemaphore", referenced from:
          FX::FXSemaphore::~FXSemaphore() in FXThread.o
          FX::FXSemaphore::~FXSemaphore() in FXThread.o
      "_MPSignalSemaphore", referenced from:
          FX::FXSemaphore::post() in FXThread.o
      "_MPWaitOnSemaphore", referenced from:
          FX::FXSemaphore::wait() in FXThread.o
          FX::FXSemaphore::trywait() in FXThread.o
    ld: symbol(s) not found for architecture x86_64

/cc ZHF #45961
2018-09-25 22:31:19 +02:00
John Ericson
26272e52a0
Merge pull request #47362 from obsidiansystems/ghc-sphinx
ghc: Sphinx is a build-time dependency
2018-09-25 16:31:11 -04:00
John Ericson
21c2437cc6 ghc: Sphinx is a build-time dependency 2018-09-25 16:29:03 -04:00
Will Dietz
3ede6674a6 spectral: init at 2018-09-24
* needs at least qtgraphicaleffects not mentioned in docs
* doesn't want to use our libqmatrixclient, so let it use bundled
* took a few runs (or perhaps just patience with one) to populate,
  when my profile icon appeared it seemed ready-- then click it
  to see list of rooms and such.
2018-09-25 15:13:15 -05:00
Michael Roitzsch
4b1ffa0b00 podofo: fix library linkage on Darwin (#47214)
* podofo: fix library linkage on Darwin

Because the library is not yet installed when the tools are build, it does not contain its final store path as its install name. Linking the tools picks up this incorrect install name and needs to be fixed after installing.
2018-09-25 22:11:17 +02:00
Jörg Thalheim
f4adfea559
Merge pull request #47351 from gnidorah/telegram
tdesktop: support opening urls under wayland
2018-09-25 21:09:48 +01:00
Will Dietz
332a7ec57f mtxclient: 0.1.0 -> 0.2.0 2018-09-25 15:01:42 -05:00
Will Dietz
ab2061bff3 nheko: 0.5.5 -> 0.6.0 2018-09-25 15:01:42 -05:00
xeji
367b8a0c49
Merge pull request #47335 from Chiiruno/dev/bump
Update: linux_testing_bcachefs, dolphinEmuMaster, easyjson, quicktemplate, hydron
2018-09-25 22:00:50 +02:00
volth
06faf5cc5c perl: add devel version at 5.29.3 2018-09-25 19:51:20 +00:00
John Ericson
16fcd3ef68
Merge pull request #47360 from obsidiansystems/python-format
python-*: Format `pythonPackages` bindings
2018-09-25 15:39:53 -04:00
John Ericson
715e0a4e59 python-*: Format pythonPackages bindings 2018-09-25 15:27:09 -04:00
Orivej Desh (NixOS)
95c67caf54
Merge pull request #47348 from tarigo/grpc_upgrade
grpc: 1.10.1 -> 1.15.0
2018-09-25 19:19:59 +00:00
Igor Tarasov
292bb74552 python.pkgs.grpcio: 1.14.1 -> 1.15.0 2018-09-25 19:06:07 +00:00
Igor Tarasov
f34649e7f5 grpc: 1.10.1 -> 1.15.0 2018-09-25 19:06:07 +00:00
Orivej Desh (NixOS)
39f86379c6
Merge pull request #47353 from orivej/protobuf
protobuf: default to 3.6
2018-09-25 18:57:18 +00:00
Dylan Simon
c77e8096ee python.pkgs.cheroot: fix setup patch URL (#47320) (#47354)
Fix to specific patch revision rather than latest
2018-09-25 20:20:57 +02:00
worldofpeace
6cd28a468a eolie: 0.9.36 -> 0.9.37 (#47345) 2018-09-25 20:16:03 +02:00
Orivej Desh
42df4e6686 pokerth: build with protobuf 3.4
It fails to compile with 3.5 and 3.6.
2018-09-25 17:45:35 +00:00
Orivej Desh
9eb751496c python.pkgs.protobuf: build with the default protobuf 2018-09-25 17:45:35 +00:00
Orivej Desh
616c30af9f protobuf: default to protobuf3_6 2018-09-25 17:45:35 +00:00
gnidorah
e79ccc1100 tdesktop: support opening urls under wayland 2018-09-25 20:26:46 +03:00
Patrick Hilhorst
5a12a5bd57 circleci-cli: 0.1.2307 -> 0.1.2569 (#47347) 2018-09-25 18:36:55 +02:00
worldofpeace
a51c855d5b lollypop: 0.9.522 -> 0.9.601 (#47344) 2018-09-25 18:33:20 +02:00
Vladyslav Mykhailichenko
33eceb98f9 cargo-edit: 0.3.0 -> 0.3.1 2018-09-25 18:24:09 +03:00
R. RyanTM
6d8f22a58b batctl: 2018.2 -> 2018.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/batctl/versions
2018-09-25 08:18:39 -07:00
R. RyanTM
26629e0847 cb2bib: 1.9.8 -> 1.9.9
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cb2bib/versions
2018-09-25 08:09:37 -07:00
R. RyanTM
fd4df30cd5 apktool: 2.3.3 -> 2.3.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apktool/versions
2018-09-25 08:02:35 -07:00
adisbladis
7e3d35afc5
obs-linuxbrowser: 0.5.0 -> 0.5.2 2018-09-25 22:55:24 +08:00