Commit Graph
154076 Commits
Author SHA1 Message Date
Sarah BrofeldtandGitHub d0ded2e261 Merge pull request #47369 from ejpcmac/update-erlangR20
erlangR20: 20.3.8 -> 20.3.8.9
2018-09-27 10:21:44 +02:00
Sarah BrofeldtandGitHub fc301ec387 Merge pull request #47409 from flokli/golden-cheetah-desktop-item
golden-cheetah: add desktop item and icon
2018-09-27 09:54:25 +02:00
Vincent Laporte d4ba6c0bc4 dune: 1.2.1 -> 1.3.0 2018-09-27 07:33:59 +00:00
aszlig a70d3bab72 pcsc-cyberjack: Also install cjflash tool
This tool is necessary in order to update the firmware of the secoder.

The reason I've added this to a separate output "tools" is because it
clearly is not relevant for the PCSC driver itself and it's also very
rarely needed.

I've also verified wether the closure of the PCSC plugin env still only
contains the main output and that's the case.

There are also other tools - cjBingoTest and cjgeldkarte, where the
former doesn't compile due to cjeca32.h not being found and cjgeldkarte,
which does compile but tries to dlopen() the library and subsequently
fails.

Both of these tools however look like they're just performing tests and
are not very useful outside of development, so I opted to not include
them.

Signed-off-by: aszlig <aszlig@nix.build>
2018-09-27 04:30:21 +02:00
aszlig f37f34e3dc pcsc-cyberjack: 3.99.5_SP09 -> 3.99.5_SP12
3.99.5_SP12:

  * Add support for cyberJack one MF

3.99.5_SP11:

  * Add support for cyberJack one

3.99.5_SP10:

  * Add support for SHUReader and SISReader
  * Update to the Reiner-SCT repository rev cyberJack@1305

Signed-off-by: aszlig <aszlig@nix.build>
2018-09-27 04:30:19 +02:00
Ryan Mulligan e1a851811b psmisc: get src from GitLab 2018-09-26 19:12:53 -07:00
Austin Seipp af48e5783a libiio: install python bindings
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-09-26 19:37:40 -05:00
Patrick Hilhorst 71eb7adfb2 vivaldi: 1.15.1147.64-1 -> 2.0.1309.29-2 2018-09-27 00:50:57 +02:00
Will DietzandGitHub de39960f6f Merge pull request #47402 from dtzWill/update/nheko-0.6.1
nheko: 0.6.0 -> 0.6.1
2018-09-26 17:26:04 -05:00
Graham Christensen 4fe9006190 dockerTools.buildLayeredImage: init
Create a many-layered Docker Image.

Implements much less than buildImage:

 - Doesn't support specific uids/gids
 - Doesn't support runninng commands after building
 - Doesn't require qemu
 - Doesn't create mutable copies of the files in the path
 - Doesn't support parent images

If you want those feature, I recommend using buildLayeredImage as an
input to buildImage.

Notably, it does support:

 - Caching low level, common paths based on a graph traversial
   algorithm, see referencesByPopularity in
   0a80233487993256e811f566b1c80a40394c03d6
 - Configurable number of layers. If you're not using AUFS or not
   extending the image, you can specify a larger number of layers at
   build time:

       pkgs.dockerTools.buildLayeredImage {
         name = "hello";
         maxLayers = 128;
         config.Cmd = [ "${pkgs.gitFull}/bin/git" ];
       };

 - Parallelized creation of the layers, improving build speed.
 - The contents of the image includes the closure of the configuration,
   so you don't have to specify paths in contents and config.

   With buildImage, paths referred to by the config were not included
   automatically in the image. Thus, if you wanted to call Git, you
   had to specify it twice:

       pkgs.dockerTools.buildImage {
         name = "hello";
         contents = [ pkgs.gitFull ];
         config.Cmd = [ "${pkgs.gitFull}/bin/git" ];
       };

   buildLayeredImage on the other hand includes the runtime closure of
   the config when calculating the contents of the image:

       pkgs.dockerTools.buildImage {
         name = "hello";
         config.Cmd = [ "${pkgs.gitFull}/bin/git" ];
       };

Minor Problems

 - If any of the store paths change, every layer will be rebuilt in
   the nix-build. However, beacuse the layers are bit-for-bit
   reproducable, when these images are loaded in to Docker they will
   match existing layers and not be imported or uploaded twice.

Common Questions

 - Aren't Docker layers ordered?

   No. People who have used a Dockerfile before assume Docker's
   Layers are inherently ordered. However, this is not true -- Docker
   layers are content-addressable and are not explicitly layered until
   they are composed in to an Image.

 - What happens if I have more than maxLayers of store paths?

   The first (maxLayers-2) most "popular" paths will have their own
   individual layers, then layer #(maxLayers-1) will contain all the
   remaining "unpopular" paths, and finally layer #(maxLayers) will
   contain the Image configuration.
2018-09-26 17:54:14 -04:00
Markus Kowalewski 676825f6fe mpi4py: Add patch to skip broken tests.
Fixes compilation with openmpi-3.1.2
2018-09-26 23:39:18 +02:00
Markus KowalewskiandMarkus Kowalewski be02ab2f30 openmpi: 3.1.0 -> 3.1.2 2018-09-26 23:38:55 +02:00
Corey O'Connorandxeji 26ce265258 vlc: 3.0.3 -> 3.0.4 (#47406) 2018-09-26 23:22:40 +02:00
Vincent Laporteandxeji 23900febe7 coq: 8.8.1 -> 8.8.2 (#47388) 2018-09-26 22:26:39 +02:00
Florian Klink bb51ba9bb8 golden-cheetah: add desktop item and icon 2018-09-26 22:21:01 +02:00
Wael M. Nasreddine f95c18f3d1 terraform-provider-nixos: move the provider to the inside of terraform.withPlugins 2018-09-26 13:10:27 -07:00
Wael M. Nasreddine 77b5440640 terraform: update all the providers 2018-09-26 13:10:27 -07:00
John EricsonandGitHub e59a2ef7eb Merge pull request #47400 from obsidiansystems/paxctl-darwin-no-mass-rebuild
paxctl: Fix darwin and cross without mass-rebuild
2018-09-26 15:52:31 -04:00
Graham Christensen fd045173ce referencesByPopularity: init to sort packages by a cachability heuristic
Using a simple algorithm, convert the references to a path in to a
sorted list of dependent paths based on how often they're referenced
and how deep in the tree they live. Equally-"popular" paths are then
sorted by name.

The existing writeReferencesToFile prints the paths in a simple
ascii-based sorting of the paths.

Sorting the paths by graph improves the chances that the difference
between two builds appear near the end of the list, instead of near
the beginning. This makes a difference for Nix builds which export a
closure for another program to consume, if that program implements its
own level of binary diffing.

For an example, Docker Images. If each store path is a separate layer
then Docker Images can be very efficiently transfered between systems,
and we get very good cache reuse between images built with the same
version of Nixpkgs. However, since Docker only reliably supports a
small number of layers (42) it is important to pick the individual
layers carefully. By storing very popular store paths in the first 40
layers, we improve the chances that the next Docker image will share
many of those layers.*

Given the dependency tree:

    A - B - C - D -\
     \   \   \      \
      \   \   \      \
       \   \ - E ---- F
        \- G

Nodes which have multiple references are duplicated:

    A - B - C - D - F
     \   \   \
      \   \   \- E - F
       \   \
        \   \- E - F
         \
          \- G

Each leaf node is now replaced by a counter defaulted to 1:

    A - B - C - D - (F:1)
     \   \   \
      \   \   \- E - (F:1)
       \   \
        \   \- E - (F:1)
         \
          \- (G:1)

Then each leaf counter is merged with its parent node, replacing the
parent node with a counter of 1, and each existing counter being
incremented by 1. That is to say `- D - (F:1)` becomes `- (D:1, F:2)`:

    A - B - C - (D:1, F:2)
     \   \   \
      \   \   \- (E:1, F:2)
       \   \
        \   \- (E:1, F:2)
         \
          \- (G:1)

Then each leaf counter is merged with its parent node again, merging
any counters, then incrementing each:

    A - B - (C:1, D:2, E:2, F:5)
     \   \
      \   \- (E:1, F:2)
       \
        \- (G:1)

And again:

    A - (B:1, C:2, D:3, E:4, F:8)
     \
      \- (G:1)

And again:

    (A:1, B:2, C:3, D:4, E:5, F:9, G:2)

and then paths have the following "popularity":

    A     1
    B     2
    C     3
    D     4
    E     5
    F     9
    G     2

and the popularity contest would result in the paths being printed as:

    F
    E
    D
    C
    B
    G
    A

* Note: People who have used a Dockerfile before assume Docker's
Layers are inherently ordered. However, this is not true -- Docker
layers are content-addressable and are not explicitly layered until
they are composed in to an Image.
2018-09-26 15:50:10 -04:00
Graham Christensen 2bf0ee3b2b dockertools: tarsum: turn in to a buildInput 2018-09-26 15:50:04 -04:00
John Ericson f49ca01c50 Revert "stdenv: partial revert of f2bb59e"
This reverts commit 607063f61b.
2018-09-26 14:47:16 -04:00
John Ericson a3fd29883a paxctl: Fix cross and Darwin builds 2018-09-26 14:47:16 -04:00
Will Dietz 98cb225d9f nheko: 0.6.0 -> 0.6.1 2018-09-26 13:42:36 -05:00
Matthew BauerandGitHub 07cc937d60 Merge pull request #45934 from utdemir/master
bluejeans-gui: init at 1.6.39
2018-09-26 13:26:53 -05:00
Amin BandaliandJörg Thalheim 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 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 BauerandJohn Ericson 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 f9c4075873cb56464126f993d22a1a72f7cfac45)
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:

https://github.com/NixOS/nixpkgs/pull/46487/commits/c3612b97e625ad0d70c6ba56d191bcb9a403f44c#r220576764

Signed-off-by: aszlig <aszlig@nix.build>
Reported-by: Ryan Mulligan <ryan@ryantm.com>
2018-09-26 16:17:18 +02:00
rembo10andxeji ca3231a9f3 arc-theme: 2017-05-12 -> 20180715 (#43490) 2018-09-26 15:56:47 +02:00
R. RyanTMandxeji 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
Victor SENE e387f2506b roundcube: simplify using fetchzip 2018-09-26 15:34:46 +02:00
vanzefandJörg Thalheim 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 WoudenbergandRobin Gloster e0f46105aa nodejs-10_x: 10.9.0 -> 10.11.0 2018-09-26 11:49:18 +02:00
zimbatmandRobin Gloster 9fb79868ab google-compute-engine: 20180510 -> 20180905
The list of corresponding NixOS services are also updated
2018-09-26 11:48:16 +02:00
R. RyanTMandRobin Gloster 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 VolosatovsandRobin Gloster eb7b217182 go-2fa: Init at 1.1.0 2018-09-26 11:36:02 +02:00
R. RyanTMandRobin Gloster 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 ThalheimandGitHub 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
volthandxeji 92a9c5ac7d net_snmp: build with default perl (#47373) 2018-09-26 08:51:22 +02:00
Will DietzandGitHub 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
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
xejiandGitHub 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 ThalheimandGitHub 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