1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-07 13:03:06 +00:00
Commit graph

153888 commits

Author SHA1 Message Date
John Ericson a3fd29883a paxctl: Fix cross and Darwin builds 2018-09-26 14:47:16 -04:00
Matthew Bauer 07cc937d60
Merge pull request #45934 from utdemir/master
bluejeans-gui: init at 1.6.39
2018-09-26 13:26:53 -05:00
John Ericson 219a48f1ca
Merge pull request #47395 from obsidiansystems/paxctl-darwin
paxctl: Fix darwin and cross and use for linux cross
2018-09-26 13:55:49 -04:00
Amin Bandali 4586ff7395 alloy: add alloy5 and take maintainership (#47262)
Add alloy5 (currently, 5.0.0.1), update homepage and downloadPage, and
take maintainership of the package.
2018-09-26 17:46:58 +01:00
Franz Pletz e7ca9af4cc
shairport-sync: fix pulseaudio support & default arguments 2018-09-26 18:12:02 +02:00
John Ericson 361521f5b0 Revert "stdenv: partial revert of f2bb59e"
This reverts commit 607063f61b.
2018-09-26 11:26:27 -04:00
John Ericson 115bc86e6c paxctl: Fix cross and Darwin builds 2018-09-26 11:26:14 -04:00
John Ericson e2a2073011 Merge remote-tracking branch 'upstream/master' into staging 2018-09-26 11:23:18 -04:00
John Ericson 30d24a2e3f Merge commit '607063f61be3b19a2da054776b360d9c5b03038a'
This gets the partial revert on the common ancestor of master and
staging, easier further devlopment.
2018-09-26 11:20:28 -04:00
Matthew Bauer 607063f61b stdenv: partial revert of f2bb59e
/cc @Ericson2314

PR was https://github.com/NixOS/nixpkgs/pull/46857

This line broke MacOS cross compilation. paxctl cannot be built on
macOS. Maybe it can be fixed, but no reason to break things
unnecessarily.

Regardless, you definitely need to be more careful about backporting.
I think it’s fine to move fast and break things on master but
with release-18.09 we should be more careful. Something like more
automated testing for cross compilation would also be
helpful (hopefully even making it block).

(cherry picked from commit f9c4075873)
2018-09-26 11:13:22 -04:00
aszlig 593062ddc2
fetchFromGitLab: Fix grouping issue for group arg
Issue introduced by c3612b97e6.

Example output before that commit (witch a random package using
fetchFromGitLab):

$ nix-instantiate --eval -A hiawatha.src.urls
[ "https://gitlab.com/api/v4/projects/hsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ]

After the commit:

$ nix-instantiate --eval -A hiawatha.src.urls
[ "https://gitlab.com/api/v4/projects/%2Fhsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ]

And with this very commit, which fixes the issue:

$ nix-instantiate --eval -A hiawatha.src.urls
[ "https://gitlab.com/api/v4/projects/hsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ]

The problem was that it has used optionalString in conjunction with "+",
so the optionalString only applied to the left-hand side of the +
operator.

Thanks to @ryantm for reporting the issue at:

c3612b97e6 (r220576764)

Signed-off-by: aszlig <aszlig@nix.build>
Reported-by: Ryan Mulligan <ryan@ryantm.com>
2018-09-26 16:17:18 +02:00
rembo10 ca3231a9f3 arc-theme: 2017-05-12 -> 20180715 (#43490) 2018-09-26 15:56:47 +02:00
R. RyanTM 9390a261dd nfs-utils: 2.3.2 -> 2.3.3 (#46989)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nfs-utils/versions
2018-09-26 15:36:31 +02:00
vanzef 82f2ae0260 gitAndTools.pass-git-helper: init at 0.4 (#47056) 2018-09-26 13:46:05 +01:00
Tim Steinbach 24c31d43bb
linux: 4.18.9 -> 4.18.10 2018-09-26 08:01:20 -04:00
Tim Steinbach 61452c82ae
linux: 4.14.71 -> 4.14.72 2018-09-26 08:01:13 -04:00
Tim Steinbach 8e4d980904
linux: 4.9.128 -> 4.9.129 2018-09-26 08:01:05 -04:00
Tim Steinbach 656ca2296c
linux: 4.4.157 -> 4.4.158 2018-09-26 08:00:56 -04:00
Domen Kožar 82feb4b66e
postgresql: give postgres user a shell 2018-09-26 12:11:40 +01:00
Jasper Woudenberg e0f46105aa nodejs-10_x: 10.9.0 -> 10.11.0 2018-09-26 11:49:18 +02:00
zimbatm 9fb79868ab google-compute-engine: 20180510 -> 20180905
The list of corresponding NixOS services are also updated
2018-09-26 11:48:16 +02:00
R. RyanTM 0441faea05 libsigrokdecode: 0.5.1 -> 0.5.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libsigrokdecode/versions
2018-09-26 11:36:18 +02:00
Roman Volosatovs eb7b217182 go-2fa: Init at 1.1.0 2018-09-26 11:36:02 +02:00
R. RyanTM 0e5e4aed06 arpack: 3.5.0 -> 3.6.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/arpack/versions
2018-09-26 11:28:59 +02:00
Jörg Thalheim 957eec3122
Merge pull request #47326 from r-ryantm/auto-update/bibutils
bibutils: 6.6 -> 6.7
2018-09-26 09:21:33 +01:00
Matthew Bauer 6eef893f5c stdenv: partial revert of f2bb59
/cc @Ericson2314

This line broke MacOS cross compilation. paxctl cannot be built on
macOS. Maybe it can be fixed, but no reason to break things
unnecessarily.

Regardless, you definitely need to be more careful about backporting.
I think it’s fine to move fast and break things on master but
with release-18.09 we should be more careful. Something like more
automated testing for cross compilation would also be
helpful (hopefully even making it block).
2018-09-26 02:09:22 -05:00
volth 92a9c5ac7d net_snmp: build with default perl (#47373) 2018-09-26 08:51:22 +02:00
Will Dietz ab925bf662
Merge pull request #47380 from dtzWill/update/libxinerama-1.1.4
libXinerama: 1.1.3 -> 1.1.4
2018-09-25 22:17:18 -05:00
Will Dietz 232998c4a7
Merge pull request #47327 from dtzWill/update/cairo-1.15.14
cairo: 1.15.12 -> 1.15.14
2018-09-25 22:16:25 -05:00
Will Dietz a0248a0b68
Merge pull request #47365 from dtzWill/feature/matrix-clients
spectral: init at 2018-09-24; nheko: 0.5.0 -> 0.6.0 and bump dep mtxclient
2018-09-25 22:14:29 -05:00
Will Dietz 7047d60ef4 libXinerama: 1.1.3 -> 1.1.4
https://lists.x.org/archives/xorg-announce/2018-July/002905.html
2018-09-25 20:07:31 -05:00
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
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
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
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