1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 11:32:03 +00:00
Commit graph

1027 commits

Author SHA1 Message Date
John Ericson 8e891e6ed4 Merge remote-tracking branch 'upstream/master' into staging 2018-05-14 10:57:33 -04:00
xeji 66d204188b
virtmanager: add missing virt-install runtime deps (#40380)
virt-install calls some programs from initrdinject.py
that were missing on PATH
2018-05-13 19:58:10 +02:00
John Ericson 2c5d915200 Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging 2018-05-13 01:02:09 -04:00
obadz f0057a2f27
Merge pull request #40313 from r-ryantm/auto-update/virtualbox
virtualbox: 5.2.10 -> 5.2.12
2018-05-12 14:35:38 +02:00
obadz d4ec02fa7b Revert "Fix pci_get_bus_and_slot removed in kernel 4.17"
This reverts commit d25607c79d.

Reverted as part of #40313 based on commit author's comment:
https://github.com/NixOS/nixpkgs/pull/40313#issuecomment-388409185
2018-05-12 13:16:10 +01:00
Florian Klink b6708a4c9a virtualbox: update extpack and guest additions checksums 2018-05-12 13:15:28 +01:00
John Ericson ee4b56edd3 Merge remote-tracking branch 'upstream/master' into staging 2018-05-11 14:36:08 -04:00
Tim Steinbach 46440d3426
docker-edge: 18.04.0-ce -> 18.05.0-ce 2018-05-11 09:19:41 -04:00
R. RyanTM 2c591d6622 virtualbox: 5.2.10 -> 5.2.12
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage -h’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage --help’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage help’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxBalloonCtrl -h’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxBalloonCtrl --help’ got 0 exit code
- found 5.2.12 with grep in /nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12
- directory tree listing: https://gist.github.com/f9bf852a0a8e6e0b4c44a9b68764850b
2018-05-10 21:10:34 -07:00
Frederik Rietdijk a18b493e02 Merge master into staging 2018-05-09 10:48:01 +02:00
Justin Bedo 48808f1c93
singularity: add missing file dependency 2018-05-09 10:19:38 +10:00
Matthew Bauer 6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
scalavision aad0a825f9 singularity: 2.4.6 -> 2.5.1 2018-05-08 10:40:10 +02:00
Florian Klink 70c57fe363 qemu: fix spaces in postInstall 2018-05-07 19:23:47 +03:00
Unknown d25607c79d Fix pci_get_bus_and_slot removed in kernel 4.17 2018-05-05 11:22:32 +03:00
John Ericson cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Matthew Justin Bauer eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
xeji cd0d2f448b
Merge pull request #39868 from r-ryantm/auto-update/remotebox
remotebox: 2.4 -> 2.5
2018-05-02 20:32:44 +02:00
R. RyanTM a9f78307e6 remotebox: 2.4 -> 2.5
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/lqc90dpw05j8jvi8n0klma3cipg70h6l-remotebox-2.5/bin/remotebox -h’ got 0 exit code
- found 2.5 with grep in /nix/store/lqc90dpw05j8jvi8n0klma3cipg70h6l-remotebox-2.5
- directory tree listing: https://gist.github.com/52fb098e7f7315de708c331b65eadfb4
2018-05-02 10:11:10 -07:00
Florian Klink 0a80a37672 virtulabox: update guest additions hash
missed in 8eb3167e2e
2018-05-02 08:55:08 +02:00
xeji f50e688816
Merge pull request #39663 from xeji/xen-4-10-memfd
xen_4_10: fix qemu-xen build error (memfd)
2018-05-02 05:29:43 +02:00
Florian Klink 8eb3167e2e virtualbox: 5.2.8 -> 5.2.10
closes #39182.
2018-05-01 22:50:19 +02:00
Matthew Justin Bauer a1664a4c53
Merge pull request #39549 from r-ryantm/auto-update/containerd
containerd: 1.0.3 -> 1.1.0
2018-05-01 10:24:34 -05:00
xeji 8b6fe6680f
Merge pull request #39513 from xeji/qemu-2-12
qemu: 2.11.1 -> 2.12.0
2018-04-29 18:41:18 +02:00
xeji 3c4efe448d xen_4_10: fix build (qemu-xen memfd patch) 2018-04-29 00:58:50 +02:00
xeji 00610fe090 qemu-riscv: remove, obsolete with qemu 2.12
upstream qemu 2.12 includes riscv support
2018-04-26 18:15:21 +02:00
Will Dietz 3d4aa7e95d qemu: workaround 'struct sysinfo' conflict musl <--> linux
Most everyone using musl patches the linux headers instead,
but various software uses a local workaround like the
one added in this commit (psutils, for example).

It's not obvious to me which project has the "bug",
and I'm reluctant to even propose modifying our headers
without clear answer on the issue.

Also, modifying those headers triggers rebuild-all-the-things.

Hopefully upstream projects sort this out, in the meantime
adding this define is a bit of a kludge but does the job.

-------

For the curious, the patch usually is something like this:
https://patchwork.kernel.org/patch/3833241/

Here's an updated version that also ensures
kernel users get the sysinfo struct as expected too:
https://raw.githubusercontent.com/openwrt/openwrt/e3c43ade0bae9491aeea50fa361e846bb5002dc0/target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch

(cherry picked from commit dtzWill/nixpkgs@91b5f5a463)
2018-04-26 17:58:16 +02:00
R. RyanTM 8a3cdb993d containerd: 1.0.3 -> 1.1.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd -h’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd --help’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd help’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd-release -h’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd-release --help’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd-release help’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/ctr -h’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/ctr --help’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/ctr help’ got 0 exit code
- found 1.1.0 with grep in /nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0
- directory tree listing: https://gist.github.com/7b4a990853acfbf946f8abe02582f41d
2018-04-26 06:18:41 -07:00
Tim Steinbach e0ad325cd4
docker: 18.03.0 -> 18.03.1 2018-04-26 08:02:21 -04:00
adisbladis d479f3aa8e
Merge pull request #39521 from r-ryantm/auto-update/tini
tini: 0.17.0 -> 0.18.0
2018-04-26 15:29:54 +08:00
R. RyanTM 518eca8256 tini: 0.17.0 -> 0.18.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/h0h2qyxwrvsjy47m1xyv7sxzd2j0ilsi-tini-0.18.0/bin/tini -h’ got 0 exit code
- ran ‘/nix/store/h0h2qyxwrvsjy47m1xyv7sxzd2j0ilsi-tini-0.18.0/bin/tini --version’ and found version 0.18.0
- found 0.18.0 with grep in /nix/store/h0h2qyxwrvsjy47m1xyv7sxzd2j0ilsi-tini-0.18.0
- directory tree listing: https://gist.github.com/c992fd0a24dfc0365d6b62ac567d395c
2018-04-25 21:45:09 -07:00
xeji 3e3b39f173 qemu: 2.11.1 -> 2.12.0 2018-04-26 01:41:53 +02:00
John Ericson ba52ae5048 treewide: isArm -> isAarch32
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile
2018-04-25 15:28:55 -04:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Daiderd Jordan bca24c02ac
qemu: fix darwin build 2018-04-24 00:19:34 +02:00
Jörg Thalheim 942bc44c55
Merge pull request #39196 from r-ryantm/auto-update/singularity
singularity: 2.4.5 -> 2.4.6
2018-04-21 19:23:59 +01:00
xeji 5be6943696 qemu: add separate output for qemu-ga guest agent 2018-04-20 11:05:50 +02:00
R. RyanTM 8929690cd1 singularity: 2.4.5 -> 2.4.6
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/0rcn1kn4j7rmr0qn314g28vpa4xf230d-singularity-2.4.6/bin/singularity -h’ got 0 exit code
- ran ‘/nix/store/0rcn1kn4j7rmr0qn314g28vpa4xf230d-singularity-2.4.6/bin/singularity --help’ got 0 exit code
- ran ‘/nix/store/0rcn1kn4j7rmr0qn314g28vpa4xf230d-singularity-2.4.6/bin/singularity help’ got 0 exit code
- found 2.4.6 with grep in /nix/store/0rcn1kn4j7rmr0qn314g28vpa4xf230d-singularity-2.4.6
- directory tree listing: https://gist.github.com/e2f21872e885760acf461b07dd5b4f86
2018-04-20 00:28:23 -07:00
Tim Steinbach 7a424800a0
rkt: 1.29.0 -> 1.30.0 2018-04-17 20:41:08 -04:00
Matthew Bauer 52893d5276 treewide: move "extensions" drvs to dir
This cleans up the tree for pkgs/applications somewhat. Should not
change any hashes.
2018-04-17 13:50:49 -05:00
Peter Hoeg 9131f2d005 virtmanager-qt: 0.52.80 -> 0.60.88 2018-04-17 22:11:25 +08:00
xeji 10149ef5e3 qemu: add option to build with gtk support 2018-04-15 23:31:42 +02:00
Herwig Hochleitner d81f3ecb83 xen-4.8: fix qemu-xen build error in memfd.c
Apply 75e5b70e6b
see also https://www.mail-archive.com/xen-devel@lists.xenproject.org/msg08648.html

cc @eelco @tstrobel @oxij
2018-04-13 22:06:52 +02:00
Frederik Rietdijk ee6894ca12 Merge staging into master 2018-04-11 14:55:52 +02:00
Tim Steinbach d76725f3a5
docker-edge: 18.03 -> 18.04 2018-04-10 18:28:35 -04:00
Frederik Rietdijk 0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Jörg Thalheim 5d332cf758
Merge pull request #38580 from r-ryantm/auto-update/containerd
containerd: 1.0.2 -> 1.0.3
2018-04-08 11:26:48 +01:00
Frederik Rietdijk 595a72589f Merge master into staging 2018-04-08 10:54:17 +02:00
Austin Seipp 4b7f2dd622 qemu-riscv: update to qemu-2.11.92pre60378_f733c7b5f
This obsoletes two of the included patches, one of them RISC-V specific,
since they've been picked up by upstream.

This build has been confirmed as being able to build and run an (extremely
recent) RISC-V Fedora 28 Rawhide image, available from:

    https://fedorapeople.org/groups/risc-v/disk-images/

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-07 22:25:30 -05:00
R. RyanTM ed0146d1f8 containerd: 1.0.2 -> 1.0.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/containerd/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/qmgzfad2cazgv7j1k31pqs512b59b8hp-containerd-1.0.3/bin/containerd -h’ got 0 exit code
- ran ‘/nix/store/qmgzfad2cazgv7j1k31pqs512b59b8hp-containerd-1.0.3/bin/containerd --help’ got 0 exit code
- ran ‘/nix/store/qmgzfad2cazgv7j1k31pqs512b59b8hp-containerd-1.0.3/bin/containerd help’ got 0 exit code
- ran ‘/nix/store/qmgzfad2cazgv7j1k31pqs512b59b8hp-containerd-1.0.3/bin/containerd-release -h’ got 0 exit code
- ran ‘/nix/store/qmgzfad2cazgv7j1k31pqs512b59b8hp-containerd-1.0.3/bin/containerd-release --help’ got 0 exit code
- ran ‘/nix/store/qmgzfad2cazgv7j1k31pqs512b59b8hp-containerd-1.0.3/bin/containerd-release help’ got 0 exit code
- ran ‘/nix/store/qmgzfad2cazgv7j1k31pqs512b59b8hp-containerd-1.0.3/bin/containerd-stress -h’ got 0 exit code
- ran ‘/nix/store/qmgzfad2cazgv7j1k31pqs512b59b8hp-containerd-1.0.3/bin/containerd-stress --help’ got 0 exit code
- ran ‘/nix/store/qmgzfad2cazgv7j1k31pqs512b59b8hp-containerd-1.0.3/bin/containerd-stress help’ got 0 exit code
- ran ‘/nix/store/qmgzfad2cazgv7j1k31pqs512b59b8hp-containerd-1.0.3/bin/ctr -h’ got 0 exit code
- ran ‘/nix/store/qmgzfad2cazgv7j1k31pqs512b59b8hp-containerd-1.0.3/bin/ctr --help’ got 0 exit code
- ran ‘/nix/store/qmgzfad2cazgv7j1k31pqs512b59b8hp-containerd-1.0.3/bin/ctr help’ got 0 exit code
- found 1.0.3 with grep in /nix/store/qmgzfad2cazgv7j1k31pqs512b59b8hp-containerd-1.0.3
- directory tree listing: https://gist.github.com/b830fb8c24834f83e627fd6d567eae87
2018-04-07 16:39:07 -07:00